mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 18:40:39 -08:00
Code Issues Projects Releases Wiki Activity

Merge from origin/emacs-26

Browse source 
2fcf2df Fix copyright years by hand
26bed8b Update copyright year to 2019
2814292 Fix value of default frame height.  (Bug#33921)
This commit is contained in:
Paul Eggert 2018-12-31 17:57:29 -08:00
commit ba809612c0
2626 changed files with 2716 additions and 2683 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lisp/net/socks.el
View file

@ -1,6 +1,6 @@
;;; socks.el --- A Socks v5 Client for Emacs -*- lexical-binding:t -*-
;; Copyright (C) 1996-2000, 2002, 2007-2018 Free Software Foundation,
;; Copyright (C) 1996-2000, 2002, 2007-2019 Free Software Foundation,
;; Inc.
;; Author: William M. Perry <wmperry@gnu.org>