commit 0cd94b8a03e78bbfef3563ddd625b4cd817459bb (HEAD, refs/remotes/origin/master) Author: Glenn Morris Date: Mon Jun 5 21:08:07 2017 -0400 ; Update some more Maintainer: header comments ; This removes some people who are absent from commit logs or mailing ; lists for upwards of a decade. diff --git a/lisp/bs.el b/lisp/bs.el index 838e72d68c..c626698faf 100644 --- a/lisp/bs.el +++ b/lisp/bs.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1998-2017 Free Software Foundation, Inc. ;; Author: Olaf Sylvester -;; Maintainer: Olaf Sylvester +;; Maintainer: emacs-devel@gnu.org ;; Keywords: convenience ;; This file is part of GNU Emacs. diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el index 9c9dc8a4f3..86eb4e737d 100644 --- a/lisp/dabbrev.el +++ b/lisp/dabbrev.el @@ -6,7 +6,7 @@ ;; Author: Don Morrison ;; Lars Lindberg ;; (according to ack.texi) -;; Maintainer: Lars Lindberg +;; Maintainer: emacs-devel@gnu.org ;; Created: 16 Mars 1992 ;; Lindberg's last update version: 5.7 ;; Keywords: abbrev expand completion convenience diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el index e1d118a830..1d48371912 100644 --- a/lisp/dos-fns.el +++ b/lisp/dos-fns.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1991, 1993, 1995-1996, 2001-2017 Free Software ;; Foundation, Inc. -;; Maintainer: Morten Welinder +;; Maintainer: emacs-devel@gnu.org ;; Keywords: internal ;; Package: emacs diff --git a/lisp/expand.el b/lisp/expand.el index b4bd266bf5..d06287e6f9 100644 --- a/lisp/expand.el +++ b/lisp/expand.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1995-1996, 2001-2017 Free Software Foundation, Inc. ;; Author: Frederic Lepied -;; Maintainer: Frederic Lepied +;; Maintainer: emacs-devel@gnu.org ;; Keywords: abbrev ;; This file is part of GNU Emacs. diff --git a/lisp/iimage.el b/lisp/iimage.el index 3672811293..abb88ec502 100644 --- a/lisp/iimage.el +++ b/lisp/iimage.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2004-2017 Free Software Foundation, Inc. ;; Author: KOSEKI Yoshinori -;; Maintainer: KOSEKI Yoshinori +;; Maintainer: emacs-devel@gnu.org ;; Keywords: multimedia ;; This file is part of GNU Emacs. diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el index cef11db042..ef3a980f19 100644 --- a/lisp/international/ogonek.el +++ b/lisp/international/ogonek.el @@ -4,7 +4,7 @@ ;; Author: Włodek Bzyl ;; Ryszard Kubiak -;; Maintainer: Ryszard Kubiak +;; Maintainer: emacs-devel@gnu.org ;; Keywords: i18n ;; This file is part of GNU Emacs. diff --git a/lisp/mail/hashcash.el b/lisp/mail/hashcash.el index 1c24d0aac3..71567b4c0f 100644 --- a/lisp/mail/hashcash.el +++ b/lisp/mail/hashcash.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2003-2005, 2007-2017 Free Software Foundation, Inc. ;; Written by: Paul Foley (1997-2002) -;; Maintainer: Paul Foley +;; Maintainer: emacs-devel@gnu.org ;; Keywords: mail, hashcash ;; This file is part of GNU Emacs. diff --git a/lisp/obsolete/sregex.el b/lisp/obsolete/sregex.el index beca41cadb..f57befa504 100644 --- a/lisp/obsolete/sregex.el +++ b/lisp/obsolete/sregex.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1997-1998, 2000-2017 Free Software Foundation, Inc. ;; Author: Bob Glickstein -;; Maintainer: Bob Glickstein +;; Maintainer: emacs-devel@gnu.org ;; Keywords: extensions ;; Obsolete-since: 24.1 diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el index d8e9e032e7..eb0850e4ec 100644 --- a/lisp/progmodes/dcl-mode.el +++ b/lisp/progmodes/dcl-mode.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1997, 2001-2017 Free Software Foundation, Inc. ;; Author: Odd Gripenstam -;; Maintainer: Odd Gripenstam +;; Maintainer: emacs-devel@gnu.org ;; Keywords: DCL editing major-mode languages ;; This file is part of GNU Emacs. diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el index a0e44f7014..f884de1fcc 100644 --- a/lisp/progmodes/mixal-mode.el +++ b/lisp/progmodes/mixal-mode.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2003-2017 Free Software Foundation, Inc. ;; Author: Pieter E.J. Pareit -;; Maintainer: Pieter E.J. Pareit +;; Maintainer: emacs-devel@gnu.org ;; Created: 09 Nov 2002 ;; Version: 0.1 ;; Keywords: languages, Knuth, mix, mixal, asm, mixvm, The Art Of Computer Programming diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el index 1843c8e9ed..74dec30473 100644 --- a/lisp/textmodes/refer.el +++ b/lisp/textmodes/refer.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992, 1996, 2001-2017 Free Software Foundation, Inc. ;; Author: Ashwin Ram -;; Maintainer: Gernot Heiser +;; Maintainer: emacs-devel@gnu.org ;; Adapted-By: ESR ;; Keywords: bib diff --git a/lisp/view.el b/lisp/view.el index 1fd5c12c89..fb478e1778 100644 --- a/lisp/view.el +++ b/lisp/view.el @@ -4,7 +4,7 @@ ;; Foundation, Inc. ;; Author: K. Shane Hartman -;; Maintainer: Inge Frick +;; Maintainer: emacs-devel@gnu.org ;; Keywords: files ;; This file is part of GNU Emacs. commit 5cb286064f2e04bd94bb1c931f3ee31aad34aa64 Author: Glenn Morris Date: Mon Jun 5 20:48:49 2017 -0400 ; Update some Maintainer: header comments diff --git a/lisp/vc/vc-cvs.el b/lisp/vc/vc-cvs.el index e54baaa269..bab835c84a 100644 --- a/lisp/vc/vc-cvs.el +++ b/lisp/vc/vc-cvs.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1995, 1998-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc-dispatcher.el b/lisp/vc/vc-dispatcher.el index 03af032cb2..c71030aba1 100644 --- a/lisp/vc/vc-dispatcher.el +++ b/lisp/vc/vc-dispatcher.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2008-2017 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) -;; Maintainer: Eric S. Raymond +;; Maintainer: emacs-devel@gnu.org ;; Keywords: vc tools ;; Package: vc diff --git a/lisp/vc/vc-filewise.el b/lisp/vc/vc-filewise.el index 9bd665862e..16f833cc5b 100644 --- a/lisp/vc/vc-filewise.el +++ b/lisp/vc/vc-filewise.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-1996, 1998-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index 47e923c209..2c2534a034 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-1996, 1998-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 2dd8114c0d..afeb5ef23d 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 61c14788ac..fd27db381d 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 598a3adc8f..5c8b3da6f1 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-2017 Free Software Foundation, Inc. ;; Author: FSF (see vc.el for full credits) -;; Maintainer: Eric S. Raymond +;; Maintainer: emacs-devel@gnu.org ;; Package: vc ;; This file is part of GNU Emacs. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index c5fe8aa6b1..9379bcf74d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -3,7 +3,7 @@ ;; Copyright (C) 1992-1998, 2000-2017 Free Software Foundation, Inc. ;; Author: FSF (see below for full credits) -;; Maintainer: Andre Spiegel +;; Maintainer: emacs-devel@gnu.org ;; Keywords: vc tools ;; This file is part of GNU Emacs. commit 6aa1466713c9ded09b57a71592b0fd2c6e43e599 Author: Glenn Morris Date: Mon Jun 5 20:39:29 2017 -0400 Make authors.el report names that were ignored * admin/authors.el (authors-ignored-names): New. (authors-canonical-author-name): Add file and position arguments. Record ignored authors. (authors-scan-change-log, authors-scan-el): Pass file and position to authors-canonical-author-name. (authors): Also print authors that were ignored. diff --git a/admin/authors.el b/admin/authors.el index ac5da82136..4dfd183415 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -1077,6 +1077,7 @@ Additionally, for these logs we apply the `lax' elements of (defvar authors-checked-files-alist) (defvar authors-invalid-file-names) +(defvar authors-ignored-names) ;; This has become rather yucky. :( (defun authors-disambiguate-file-name (fullname) @@ -1219,7 +1220,7 @@ author and what he did in hash table TABLE. See the description of (nconc entry (list (cons action 1)))))))) -(defun authors-canonical-author-name (author) +(defun authors-canonical-author-name (author file pos) "Return a canonicalized form of AUTHOR, an author name. If AUTHOR has an entry in `authors-aliases', use that. Remove email addresses. Capitalize words in the author's name, unless @@ -1243,6 +1244,9 @@ it is found in `authors-fixed-case'." (setq author (replace-regexp-in-string "[ \t]+" " " author)) ;; NB this ignores the first name only case. (unless (string-match "[-, \t]" author) + (push (format-message "%s:%d: ignored `%s'" + file (1+ (count-lines (point-min) pos)) author) + authors-ignored-names) (setq author "")) (or (car (member author authors-fixed-case)) (capitalize author)))) @@ -1284,7 +1288,7 @@ with the file and the number of each action: Suggested\\|Trivial\\|Version\\|Originally\\|From:\\|Patch[ \t]+[Bb]y\\)"))) (push (authors-canonical-author-name (buffer-substring-no-properties - (point) (line-end-position))) authors) + (point) (line-end-position)) log-file pos) authors) (forward-line 1))) ((looking-at "^[ \t]+\\*") (let ((line (buffer-substring-no-properties @@ -1317,7 +1321,7 @@ TABLE is a hash table to add author information to." (enable-local-variables :safe) ; for find-file, hence let* (enable-local-eval nil) (buffer (find-file-noselect file))) - (setq file (authors-disambiguate-file-name (expand-file-name file))) + (setq file (expand-file-name file)) (with-current-buffer buffer (save-restriction (widen) @@ -1334,7 +1338,8 @@ TABLE is a hash table to add author information to." (skip-chars-forward "-0-9 \t") (push (authors-canonical-author-name (buffer-substring-no-properties - (point) (line-end-position))) authors) + (point) (line-end-position)) + file (line-beginning-position)) authors) ;; tips.texi says the continuation line should begin ;; with a tab, but often spaces are used. (setq continue @@ -1345,7 +1350,9 @@ TABLE is a hash table to add author information to." (and (> (length authors) 1) (setq action :cowrote)) (mapc (lambda (author) - (authors-add author file action table)) + (authors-add + author + (authors-disambiguate-file-name file) action table)) authors))))) (unless existing-buffer (kill-buffer buffer)))) @@ -1436,7 +1443,8 @@ and a buffer *Authors Errors* containing references to unknown files." (table (make-hash-table :test 'equal)) (buffer-name "*Authors*") authors-checked-files-alist - authors-invalid-file-names) + authors-invalid-file-names + authors-ignored-names) (authors-add-fixed-entries table) (dolist (log logs) (when (string-match "ChangeLog\\(.[0-9]+\\)?$" log) @@ -1500,14 +1508,20 @@ list of their contributions.\n") (symbol-name authors-coding-system) "\nEnd:\n") (message "Generating buffer %s... done" buffer-name) (unless noninteractive - (when authors-invalid-file-names + (when (or authors-invalid-file-names authors-ignored-names) (with-current-buffer (get-buffer-create "*Authors Errors*") (setq buffer-read-only nil) (erase-buffer) (set-buffer-file-coding-system authors-coding-system) - (insert "Unrecognized file entries found:\n\n") - (mapc (lambda (f) (if (not (string-match "^[A-Za-z]+$" f)) (insert f "\n"))) - (sort authors-invalid-file-names 'string-lessp)) + (when authors-invalid-file-names + (insert "Unrecognized file entries found:\n\n") + (mapc (lambda (f) (if (not (string-match "^[A-Za-z]+$" f)) (insert f "\n"))) + (sort authors-invalid-file-names 'string-lessp))) + (when authors-ignored-names + (insert "\n\nThese authors were ignored:\n\n" + (mapconcat + 'identity + (sort authors-ignored-names 'string-lessp) "\n"))) (goto-char (point-min)) (compilation-mode) (message "Errors were found. See buffer %s" (buffer-name)))) commit fcaf9327c1dabd7c045baf42de1bc6786b3f2077 Author: Glenn Morris Date: Mon Jun 5 20:38:31 2017 -0400 * admin/authors.el (authors-aliases): Additions. diff --git a/admin/authors.el b/admin/authors.el index 4285e65548..ac5da82136 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -3,7 +3,7 @@ ;; Copyright (C) 2000-2017 Free Software Foundation, Inc. ;; Author: Gerd Moellmann -;; Maintainer: Kim F. Storm +;; Maintainer: emacs-devel@gnu.org ;; Keywords: maint ;; Package: emacs @@ -27,9 +27,6 @@ ;; Use M-x authors RET to create an *Authors* buffer that can used as ;; or merged with Emacs's AUTHORS file. -;; FIXME: This needs to modernized in the light of current practice, -;; which generates a single top-level ChangeLog file from commit logs. - ;;; Code: (defvar authors-coding-system 'utf-8 @@ -81,6 +78,7 @@ files.") ("François Pinard" "Francois Pinard") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") ("Frederic Pierresteguy" "Fred Pierresteguy") + (nil "FSF") ("Gerd Möllmann" "Gerd Moellmann") ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth") ("Hrvoje Nikšić" "Hrvoje Niksic") @@ -141,6 +139,7 @@ files.") ("Peter J. Weisberg" "PJ Weisberg") ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") + ("Philipp Stephani" "Philipp .*phst@google") ("Piotr Zieliński" "Piotr Zielinski") ("Przemysław Wojnowski" "Przemyslaw Wojnowski") ("Rainer Schöpf" "Rainer Schoepf") @@ -171,6 +170,7 @@ files.") ("Takaaki Ota" "Tak Ota") ("Takahashi Naoto" "Naoto Takahashi") ("Teodor Zlatanov" "Ted Zlatanov") + (nil "The PCL-CVS Trust") ("Thomas Dye" "Tom Dye") ("Thomas Horsley" "Tom Horsley") ; FIXME ? ("Thomas Wurgler" "Tom Wurgler") commit ac5422fd23a469ffb6d6ffd37df6a7e0d4d3d46a Author: Glenn Morris Date: Mon Jun 5 20:35:17 2017 -0400 ; Small fixes for some Author: header comments diff --git a/lisp/cdl.el b/lisp/cdl.el index 2fc74decaf..16ba7e7d52 100644 --- a/lisp/cdl.el +++ b/lisp/cdl.el @@ -2,7 +2,7 @@ ;; Copyright (C) 1993, 2001-2017 Free Software Foundation, Inc. -;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi) +;; Author: Ata Etemadi ;; Maintainer: emacs-devel@gnu.org ;; Keywords: data diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index ea1ad7c064..2760c4d276 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -4,8 +4,8 @@ ;; Author: Michael McNamara ;; Wilson Snyder -;; http://www.verilog.com -;; http://www.veripool.org +;; X-URL: http://www.verilog.com +;; X-URL: http://www.veripool.org ;; Created: 3 Jan 1996 ;; Keywords: languages diff --git a/lisp/vc/pcvs.el b/lisp/vc/pcvs.el index 026765a069..e48f72643e 100644 --- a/lisp/vc/pcvs.el +++ b/lisp/vc/pcvs.el @@ -2,16 +2,16 @@ ;; Copyright (C) 1991-2017 Free Software Foundation, Inc. -;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com -;; (Per Cederqvist) ceder@lysator.liu.se -;; (Greg A. Woods) woods@weird.com -;; (Jim Blandy) jimb@cyclic.com -;; (Karl Fogel) kfogel@floss.red-bean.com -;; (Jim Kingdon) kingdon@cyclic.com -;; (Stefan Monnier) monnier@cs.yale.edu -;; (Greg Klanderman) greg@alphatech.com -;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com -;; Maintainer: (Stefan Monnier) monnier@gnu.org +;; Author: The PCL-CVS Trust +;; Per Cederqvist +;; Greg A. Woods +;; Jim Blandy +;; Karl Fogel +;; Jim Kingdon +;; Stefan Monnier +;; Greg Klanderman +;; Jari Aalto+mail.emacs +;; Maintainer: Stefan Monnier ;; Keywords: CVS, vc, release management ;; This file is part of GNU Emacs. commit 6a757bead92a3cb827d9b19a1a5ca931f198c045 Author: Glenn Morris Date: Mon Jun 5 20:33:55 2017 -0400 ; ChangeLog fixes diff --git a/ChangeLog.2 b/ChangeLog.2 index 4b266e1e95..3b22d48296 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -5982,10 +5982,6 @@ * lisp/progmodes/cc-engine.el (c-record-parse-state-state): Terminate stale markers. -2016-03-30 Alan Mackenzie - - Merge branch 'emacs-25' of /home/acm/emacs/emacs.git/emacs-25 into emacs-25 - 2016-03-29 Xue Fuqiao * doc/lispref/text.texi (Columns): Remove a nonexistent reference. @@ -7281,10 +7277,6 @@ 2016-02-28 Michael Albinus - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - -2016-02-28 Michael Albinus - Set auto-revert-use-notify to nil in global-auto-revert-mode. (Bug#22814) * etc/NEWS: @@ -8740,10 +8732,6 @@ that we get case-insensitive completion. (erc-completion-at-point): Remove. -2016-02-05 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2016-02-05 Michael Albinus * test/automated/file-notify-tests.el (file-notify-test06-many-events): @@ -10159,18 +10147,10 @@ alternative, such as "This allow you to do something", "This allows something to be done" or "This allows the doing of something". -2016-01-24 l3thal - - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - 2016-01-24 Kelvin White Add NEWS entry for asynchronous reconnect in ERC -2016-01-24 l3thal - - Add NEWS entry for asynchronous reconnect in ERC - 2016-01-24 Kelvin White browse-url.el: Add 'google-chrome' to supported browsers. @@ -11065,10 +11045,6 @@ 2016-01-15 Phillip Lord - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - -2016-01-15 Phillip Lord - Enable test selector from command line * test/automated/Makefile.in: Change variable manipulation to avoid @@ -11907,10 +11883,6 @@ 2016-01-04 Michael Albinus - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - -2016-01-04 Michael Albinus - Introduce check-expensive tests. * Makefile.in (check-expensive): @@ -13594,10 +13566,6 @@ * etc/tutorials/TUTORIAL.pt_BR: Fix a typo. (Bug#22165) -2015-12-13 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-12-13 Tassilo Horn Improve regex to not trigger stack overflow @@ -14202,7 +14170,7 @@ (ifconfig-program-options): Check the actual program in use. (arp-program): Check sbin directories. -2015-12-04 (tiny change) Arash Esbati (tiny change) +2015-12-04 Arash Esbati (tiny change) Fix wrong-type-argument integer-or-marker-p nil error @@ -14211,12 +14179,6 @@ 2015-12-04 Alan Mackenzie - Merge branch 'scratch/follow' of /home/acm/emacs/emacs.git/emacs-25 into scratch/follow - - Merge necessitated by a rebase operation. - -2015-12-04 Alan Mackenzie - lisp/isearch.el: Eliminate macro isearch-call-message, replacing with funcall. 2015-12-04 Alan Mackenzie @@ -15012,10 +14974,6 @@ (isearch-new-regexp-function): Define variable. (isearch-new-word): Define as an obsolete alias. (Bug#22018) -2015-11-27 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-27 Lee Bochicchio * test/automated/abbrev-tests.el: Define more tests @@ -15101,10 +15059,6 @@ 2015-11-26 Phillip Lord - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - -2015-11-26 Phillip Lord - Fix regression after merge. * src/undo.c (prepare_record): Remove call to run_undoable_change. @@ -15362,10 +15316,6 @@ 2015-11-24 Alan Mackenzie - Merge branch 'emacs-25' of git.sv.gnu.org:/srv/git/emacs into emacs-25 - -2015-11-24 Alan Mackenzie - Squashed commit of the following: commit e1ecf76585bef2eb87995f7a7f92cc12003a6f70 @@ -15540,10 +15490,6 @@ (module_copy_string_contents): Encode before reading the byte size. Return false if and only if an error occurred. -2015-11-23 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-23 Shakthi Kannan Add the tamil-dvorak input method @@ -16721,10 +16667,6 @@ 2015-11-14 Dmitry Gutov - Merge branch 'master' into emacs-25 - -2015-11-14 Dmitry Gutov - Use generic dispatch for xref backends * lisp/progmodes/xref.el (xref-backend-functions): @@ -16814,15 +16756,9 @@ (xref-query-replace): Ditto. And check that the search results are up-to-date. -2015-11-13 John Wiegley - - Merge remote-tracking branch 'origin/master' into emacs-25 +2015-11-13 Kelvin White -2015-11-13 l3thal - - Merge branch 'erc-async-reconnect' into emacs-25 - - Reconnect asynchronously. + Reconnect asynchronously in erc. 2015-11-13 Paul Eggert @@ -16843,10 +16779,6 @@ mflt_run to leave the output areas unchanged on failure, as this isn’t part of its interface spec. -2015-11-13 Eli Zaretskii - - Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emacs into emacs-25 - 2015-11-13 Paul Eggert Port recent XCB changes to 64-bit ‘long int’ @@ -31789,7 +31721,7 @@ * lisp/emacs-lisp/package.el (package-menu-execute): Remove reference to remove-dups. -2015-05-21 kwhite +2015-05-21 Kelvin White * lisp/erc/erc.el: Hide network/channel messages. (erc-network-hide-list, erc-channel-hide-list): New lists to define @@ -32188,14 +32120,8 @@ * lisp/eshell/esh-arg.el (eshell-parse-special-reference): Parse '#'. -2015-05-17 Jan D - - Merge branch 'master' into cairo - 2015-04-26 Jan D - Merge branch 'master' into cairo - Add PBM support for cairo * src/image.c (xcolor_to_argb32): New function. (get_spec_bg_or_alpha_as_argb): Call xcolor_to_argb32. @@ -32262,10 +32188,6 @@ * src/xterm.c (x_update_begin): Don't create any surface for non-visible tip frames, the geometry may be wrong. - Merge branch 'master' into cairo, fixes tooltips not shown. - - Merge branch 'master' into cairo - Add CAIRO_CFLAGS to lwlib/Makefile.in * Makefile.in (CAIRO_CFLAGS): Add. diff --git a/ChangeLog.3 b/ChangeLog.3 index f187c2852f..51245e7760 100644 --- a/ChangeLog.3 +++ b/ChangeLog.3 @@ -1629,7 +1629,7 @@ * etc/NEWS: Mention addition of 'cyrillic-tuvan' input method. -2016-11-18 Alex +2016-11-18 Alexander Gramiak Extend 'indent-relative' when its arg is non-nil @@ -18731,7 +18731,7 @@ * test/lisp/net/network-stream-tests.el: New suite of network tests. -2016-02-07 Foo +2016-02-07 Rasmus Pank Roulund Allow various Gnus and Message address variables to be functions diff --git a/doc/misc/ChangeLog.1 b/doc/misc/ChangeLog.1 index b3cb6a501a..b6c6c29444 100644 --- a/doc/misc/ChangeLog.1 +++ b/doc/misc/ChangeLog.1 @@ -822,7 +822,7 @@ * efaq.texi (Problems with very large files): Fix superscript typo. -2013-01-07 Rasmus +2013-01-07 Rasmus Pank Roulund * org.texi (Global and local cycling): Fix missing '@'. diff --git a/lisp/ChangeLog.12 b/lisp/ChangeLog.12 index 46db752e46..04c5d8138d 100644 --- a/lisp/ChangeLog.12 +++ b/lisp/ChangeLog.12 @@ -14350,7 +14350,7 @@ * progmodes/ld-script.el (auto-mode-alist): Recognize linker scripts whose file-name extensions are "\.x[bdsru]?[cn]?$". -2006-01-01 Michael Ernst (tiny changes) +2006-01-01 Michael Ernst (tiny change) * textmodes/tildify.el: Fix typos (misspellings) in the commentary. @@ -30895,7 +30895,7 @@ * textmodes/tex-mode.el (tex-view): If tex-shell process is not running, restart it. -2005-03-19 Yoichi NAKAYAMA (tiny changes) +2005-03-19 Yoichi NAKAYAMA (tiny change) * finder.el (finder-current-item): Throw an error on an empty line. diff --git a/lisp/erc/ChangeLog.1 b/lisp/erc/ChangeLog.1 index 373b179b6f..2d5403fdc1 100644 --- a/lisp/erc/ChangeLog.1 +++ b/lisp/erc/ChangeLog.1 @@ -6289,7 +6289,7 @@ * make 353 (NAMES reply) output go into the appropriate channel buffer (if it exists) or into the active erc buffer (if not). -2003-08-29 mtoledo +2003-08-29 Marcelo Toledo * erc.el: Added the variable erc-echo-notices-in-current-buffer to make possible display notices in the current buffer (queries to nickserv/chanserv/memoserv). Defaults to nil so nothing changes from what we have today. @@ -11635,10 +11635,6 @@ (erc-join-info-buffer): Changed default to 'disable. (erc-nick-completion): Changed default to 'all. -2001-07-04 uid31117 - - * erc.el: Resolved... - 2001-07-03 Alex Schroeder * erc.el(erc-highlight-strings): New option and new function. diff --git a/lisp/org/ChangeLog.1 b/lisp/org/ChangeLog.1 index 4fc9f5fe1c..9d2c666391 100644 --- a/lisp/org/ChangeLog.1 +++ b/lisp/org/ChangeLog.1 @@ -1176,7 +1176,7 @@ * org.el (org-mode): Add guard around set-face-foreground. -2014-04-22 Rasmus +2014-04-22 Rasmus Pank Roulund * ox-html.el (org-html-html5-elements): Drop reference to hgroup. @@ -6519,14 +6519,14 @@ (org-insert-link): Call `org-link-try-special-completion' from the original buffer. -2013-11-12 Oleh +2013-11-12 Oleh Krehel * org.el (org-open-at-point): The new code is being run in the same spot as `org-open-link-functions'. In case they failed, check if link matches "^id:" and if so, load the id interface and follwo the link. -2013-11-12 Rasmus (tiny change) +2013-11-12 Rasmus Pank Roulund (tiny change) * ox-latex.el (org-latex--inline-image): The pgf format is associated to an inline image and treated like tikz files. @@ -6760,7 +6760,7 @@ * org-clock.el (org-clock-notify-once-if-expired): Honor `org-clock-sound'. -2013-11-12 Rasmus Pank +2013-11-12 Rasmus Pank Roulund * org.el (org-format-latex-header): Remove eucal and amsmath. (org-latex-default-packages-alist): Remove amstext and add @@ -11195,7 +11195,7 @@ * org-latex.el (org-export-as-latex): Fix bug in setting the export directory according to the LaTeX options. -2012-04-01 K.Nagashima (tiny change) +2012-04-01 K. Nagashima (tiny change) * org.el (org-show-subtree): Make interactive. diff --git a/src/ChangeLog.13 b/src/ChangeLog.13 index 3a58c0cc75..66f062d3d3 100644 --- a/src/ChangeLog.13 +++ b/src/ChangeLog.13 @@ -17504,7 +17504,7 @@ * casetab.c (init_casetab_once): Don't abuse the ascii eqv table for the upcase table. -2013-03-27 rzl24ozi (tiny changes) +2013-03-27 rzl24ozi (tiny change) * image.c [WINDOWSNT]: Fix calls to DEF_IMGLIB_FN for SVG function. commit 695d50fa0a11c6bd98f9f4a9b5a2905d33282316 Author: Tino Calancha Date: Mon Jun 5 09:35:29 2017 +0900 * test/lisp/subr-tests.el (subr-tests-bug22027): Add test. diff --git a/test/lisp/subr-tests.el b/test/lisp/subr-tests.el index c0bfd40f80..54f4ab5d1b 100644 --- a/test/lisp/subr-tests.el +++ b/test/lisp/subr-tests.el @@ -28,6 +28,7 @@ ;;; Code: (require 'ert) +(eval-when-compile (require 'cl-lib)) (ert-deftest let-when-compile () ;; good case @@ -316,5 +317,14 @@ cf. Bug#25477." (should-not (method-files 'subr-tests--undefined-generic)) (should-not (method-files 'subr-tests--generic-without-methods))) +(ert-deftest subr-tests-bug22027 () + "Test for http://debbugs.gnu.org/22027 ." + (let ((default "foo") res) + (cl-letf (((symbol-function 'read-string) + (lambda (_prompt _init _hist def) def))) + (setq res (read-passwd "pass: " 'confirm (mapconcat #'string default ""))) + (should (string= default res))))) + + (provide 'subr-tests) ;;; subr-tests.el ends here commit 882f81fdb4ffba773af775d6d6f8920f23163e72 Author: Noam Postavsky Date: Sat Jun 3 23:41:53 2017 -0400 * lisp/subr.el (read-passwd): Don't delete return value (Bug#22027). diff --git a/lisp/subr.el b/lisp/subr.el index 0dce02de8b..ef00286b34 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -2268,7 +2268,7 @@ by doing (clear-string STRING)." (second (read-passwd "Confirm password: " nil default))) (if (equal first second) (progn - (and (arrayp second) (clear-string second)) + (and (arrayp second) (not (eq first second)) (clear-string second)) (setq success first)) (and (arrayp first) (clear-string first)) (and (arrayp second) (clear-string second)) commit 3632633cab801f84a23f60d5585acfae38f6e60c Author: Dmitry Gutov Date: Tue Jun 6 01:23:41 2017 +0300 Enable ElDoc messages after the newline command * lisp/emacs-lisp/eldoc.el: Add "newline" to the eldoc-add-command-completions call (bug#27228). diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el index 40f5e2ef96..a05bd7cc4d 100644 --- a/lisp/emacs-lisp/eldoc.el +++ b/lisp/emacs-lisp/eldoc.el @@ -418,7 +418,7 @@ return any documentation.") "down-list" "end-of-" "exchange-point-and-mark" "forward-" "goto-" "handle-select-window" "indent-for-tab-command" "left-" "mark-page" "mark-paragraph" "mouse-set-point" "move-" "move-beginning-of-" - "move-end-of-" "next-" "other-window" "pop-global-mark" "previous-" + "move-end-of-" "newline" "next-" "other-window" "pop-global-mark" "previous-" "recenter" "right-" "scroll-" "self-insert-command" "split-window-" "up-list") commit a003e87be775adc0d351ad741b609f0ee23fe560 Author: Dmitry Gutov Date: Tue Jun 6 01:04:04 2017 +0300 Enable eldoc-mode explicitly inside read--expression * lisp/simple.el (read--expression): Call eldoc-mode (bug#27202). diff --git a/lisp/simple.el b/lisp/simple.el index ea3a495fbc..df664fc050 100644 --- a/lisp/simple.el +++ b/lisp/simple.el @@ -1484,6 +1484,7 @@ display the result of expression evaluation." ;; FIXME: call emacs-lisp-mode? (add-function :before-until (local 'eldoc-documentation-function) #'elisp-eldoc-documentation-function) + (eldoc-mode 1) (add-hook 'completion-at-point-functions #'elisp-completion-at-point nil t) (run-hooks 'eval-expression-minibuffer-setup-hook)) commit f858c585a39e83e062ff33e068b8376e7aecabdf Author: Andy Moreton Date: Tue Jun 6 01:01:55 2017 +0300 Fix check for package-unsigned-archives during retrieval * lisp/emacs-lisp/package.el (package--download-one-archive): Fix check for package-unsigned-archives. diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index cb8e2d60d6..bebfd18d7a 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1529,7 +1529,7 @@ similar to an entry in `package-alist'. Save the cached copy to (when (listp (read-from-string content)) (make-directory dir t) (if (or (not package-check-signature) - (member archive package-unsigned-archives)) + (member name package-unsigned-archives)) ;; If we don't care about the signature, save the file and ;; we're done. (progn (write-region content nil local-file nil 'silent) commit 096eb7d67147e3d7f01e7d08f7da1c6bee947f50 Merge: 3d9d976aa4 c0d42853cd Author: Noah Friedman Date: Mon Jun 5 14:08:22 2017 -0700 Merge etc/emacs-buffer.gdb from emacs-25 to master. commit 3d9d976aa476b1c1098359a1215ad1cabd022d33 Author: Philipp Stephani Date: Mon Jun 5 22:09:00 2017 +0200 Fix undefined behavior in mapbacktrace * src/eval.c (Fmapbacktrace): Don't assume that PDL is still valid. diff --git a/src/eval.c b/src/eval.c index ef961046bc..8f293c9d30 100644 --- a/src/eval.c +++ b/src/eval.c @@ -3613,8 +3613,12 @@ returns nil. */) while (backtrace_p (pdl)) { + ptrdiff_t i = pdl - specpdl; backtrace_frame_apply (function, pdl); - pdl = backtrace_next (pdl); + /* Beware! PDL is no longer valid here because FUNCTION might + have caused grow_specpdl to reallocate pdlvec. We must use + the saved index, cf. Bug#27258. */ + pdl = backtrace_next (&specpdl[i]); } return Qnil; commit 9ae5c0a2e12c25f37736d9b106c55227b55521e6 Author: Eli Zaretskii Date: Mon Jun 5 19:16:04 2017 +0300 Fix emacs-module-tests on MS-Windows * src/print.c (print_vectorlike): Make sure module function's address prints with a leading "0x". This fixes emacs-module-tests on MS-Windows. Fix whitespace. * src/dynlib.c (dynlib_addr): Remove unused variable. Update commentary. diff --git a/src/dynlib.c b/src/dynlib.c index 79e98b0f28..47ba5e3d91 100644 --- a/src/dynlib.c +++ b/src/dynlib.c @@ -126,7 +126,6 @@ void dynlib_addr (void *addr, const char **fname, const char **symname) { static char dll_filename[MAX_UTF8_PATH]; - static char addr_str[22]; static GetModuleHandleExA_Proc s_pfn_Get_Module_HandleExA = NULL; char *dll_fn = NULL; HMODULE hm_kernel32 = NULL; @@ -216,8 +215,9 @@ dynlib_addr (void *addr, const char **fname, const char **symname) of the module functions will be unexported, and probably even static, which means the symbols can be obtained only if we link against libbfd (and the DLL can be stripped anyway). So we just - show the address and the file name; they can use that with - addr2line or GDB to recover the symbolic name. */ + show the address and the file name (see print_vectorlike in + print.c); they can use that with addr2line or GDB to recover the + symbolic name. */ *symname = NULL; } diff --git a/src/print.c b/src/print.c index 76ae10fe13..aaec5b0495 100644 --- a/src/print.c +++ b/src/print.c @@ -1701,31 +1701,36 @@ print_vectorlike (Lisp_Object obj, Lisp_Object printcharfun, bool escapeflag, #ifdef HAVE_MODULES case PVEC_MODULE_FUNCTION: { - print_c_string ("#subr; - const char *file = NULL; - const char *symbol = NULL; - dynlib_addr (ptr, &file, &symbol); - - if (symbol == NULL) - { - print_c_string ("at ", printcharfun); - enum { pointer_bufsize = sizeof ptr * 16 / CHAR_BIT + 2 + 1 }; - char buffer[pointer_bufsize]; - int needed = snprintf (buffer, sizeof buffer, "%p", ptr); - eassert (needed <= sizeof buffer); - print_c_string (buffer, printcharfun); - } - else - print_c_string (symbol, printcharfun); - - if (file != NULL) - { - print_c_string (" from ", printcharfun); - print_c_string (file, printcharfun); - } - - printchar ('>', printcharfun); + print_c_string ("#subr; + const char *file = NULL; + const char *symbol = NULL; + dynlib_addr (ptr, &file, &symbol); + + if (symbol == NULL) + { + print_c_string ("at ", printcharfun); + enum { pointer_bufsize = sizeof ptr * 16 / CHAR_BIT + 2 + 1 }; + char buffer[pointer_bufsize]; + int needed = snprintf (buffer, sizeof buffer, "%p", ptr); + const char p0x[] = "0x"; + eassert (needed <= sizeof buffer); + /* ANSI C doesn't guarantee that %p produces a string that + begins with a "0x". */ + if (c_strncasecmp (buffer, p0x, sizeof (p0x) - 1) != 0) + print_c_string (p0x, printcharfun); + print_c_string (buffer, printcharfun); + } + else + print_c_string (symbol, printcharfun); + + if (file != NULL) + { + print_c_string (" from ", printcharfun); + print_c_string (file, printcharfun); + } + + printchar ('>', printcharfun); } break; #endif commit 5d29c0f006d071008eba8d235db917d5c8b271bb Author: Philipp Stephani Date: Mon Jun 5 13:05:51 2017 +0200 Use unwind protection to clean up data structures in modules Reuse existing functionality and simplify the code a bit. * src/emacs-module.c (Fmodule_load): Use unwind protection to clean up runtime object. (funcall_module): Use unwind protection to clean up environment object. (finalize_environment): Simplify signature. (finalize_environment_unwind, finalize_runtime_unwind): New functions. diff --git a/src/emacs-module.c b/src/emacs-module.c index 71e04d869e..bebfe59442 100644 --- a/src/emacs-module.c +++ b/src/emacs-module.c @@ -96,7 +96,9 @@ static emacs_value lisp_to_value (Lisp_Object); static enum emacs_funcall_exit module_non_local_exit_check (emacs_env *); static void check_main_thread (void); static void initialize_environment (emacs_env *, struct emacs_env_private *); -static void finalize_environment (emacs_env *, struct emacs_env_private *); +static void finalize_environment (emacs_env *); +static void finalize_environment_unwind (void *); +static void finalize_runtime_unwind (void *); static void module_handle_signal (emacs_env *, Lisp_Object); static void module_handle_throw (emacs_env *, Lisp_Object); static void module_non_local_exit_signal_1 (emacs_env *, Lisp_Object, Lisp_Object); @@ -634,8 +636,10 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0, .private_members = &rt, .get_environment = module_get_environment }; + ptrdiff_t count = SPECPDL_INDEX (); + record_unwind_protect_ptr (finalize_runtime_unwind, &pub); + int r = module_init (&pub); - finalize_environment (&rt.pub, &priv); if (r != 0) { @@ -644,7 +648,7 @@ DEFUN ("module-load", Fmodule_load, Smodule_load, 1, 1, 0, xsignal2 (Qmodule_init_failed, file, make_number (r)); } - return Qt; + return unbind_to (count, Qt); } Lisp_Object @@ -659,6 +663,8 @@ funcall_module (Lisp_Object function, ptrdiff_t nargs, Lisp_Object *arglist) emacs_env pub; struct emacs_env_private priv; initialize_environment (&pub, &priv); + ptrdiff_t count = SPECPDL_INDEX (); + record_unwind_protect_ptr (finalize_environment_unwind, &pub); USE_SAFE_ALLOCA; ATTRIBUTE_MAY_ALIAS emacs_value *args; @@ -683,22 +689,11 @@ funcall_module (Lisp_Object function, ptrdiff_t nargs, Lisp_Object *arglist) switch (priv.pending_non_local_exit) { case emacs_funcall_exit_return: - finalize_environment (&pub, &priv); - return value_to_lisp (ret); + return unbind_to (count, value_to_lisp (ret)); case emacs_funcall_exit_signal: - { - Lisp_Object symbol = priv.non_local_exit_symbol; - Lisp_Object data = priv.non_local_exit_data; - finalize_environment (&pub, &priv); - xsignal (symbol, data); - } + xsignal (priv.non_local_exit_symbol, priv.non_local_exit_data); case emacs_funcall_exit_throw: - { - Lisp_Object tag = priv.non_local_exit_symbol; - Lisp_Object value = priv.non_local_exit_data; - finalize_environment (&pub, &priv); - Fthrow (tag, value); - } + Fthrow (priv.non_local_exit_symbol, priv.non_local_exit_data); default: eassume (false); } @@ -912,13 +907,25 @@ initialize_environment (emacs_env *env, struct emacs_env_private *priv) /* Must be called before the lifetime of the environment object ends. */ static void -finalize_environment (emacs_env *env, struct emacs_env_private *priv) +finalize_environment (emacs_env *env) { - eassert (env->private_members == priv); eassert (XSAVE_POINTER (XCAR (Vmodule_environments), 0) == env); Vmodule_environments = XCDR (Vmodule_environments); } +static void +finalize_environment_unwind (void *env) +{ + finalize_environment (env); +} + +static void +finalize_runtime_unwind (void* raw_ert) +{ + struct emacs_runtime *ert = raw_ert; + finalize_environment (&ert->private_members->pub); +} + /* Non-local exit handling. */ commit 9f496c591d457b511a42c0f63e0d2d923cda0247 Merge: 751d5920be 13e9493ea3 Author: Michael Albinus Date: Mon Jun 5 13:00:07 2017 +0200 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs commit 751d5920bed1a3af01fd5a31ce4eb7d8b6994151 Author: Michael Albinus Date: Mon Jun 5 12:59:26 2017 +0200 Some minor tweaks in tramp-tests.el * test/lisp/net/tramp-tests.el (tramp-test05-expand-file-name-relative): Let it pass for all gfvs based methods. (tramp-test24-file-name-completion): Run method and host completion for all syntaxes only when expensive tests are enabled. Do not check host completion for gvfs based methods. (tramp--test-gvfs-p): Add optional METHOD argument. (tramp--test-afp-or-smb-p): Remove. diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 8c97fafa3e..6876f20d41 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -1625,8 +1625,9 @@ handled properly. BODY shall not contain a timeout." ;; Mark as failed until bug has been fixed. :expected-result :failed (skip-unless (tramp--test-enabled)) - ;; File names with a share behave differently. - (when (or (tramp--test-adb-p) (tramp--test-afp-or-smb-p)) + ;; These are the methods the test doesn't fail. + (when (or (tramp--test-adb-p) (tramp--test-gvfs-p) + (tramp-smb-file-name-p tramp-test-temporary-file-directory)) (setf (ert-test-expected-result-type (ert-get-test 'tramp-test05-expand-file-name-relative)) :passed)) @@ -2502,7 +2503,10 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (orig-syntax tramp-syntax)) (unwind-protect - (dolist (syntax (tramp-syntax-values)) + (dolist + (syntax + (if tramp--test-expensive-test + (tramp-syntax-values) `(,orig-syntax))) (tramp-change-syntax syntax) (let ;; This is needed for the `simplified' syntax. ((method-marker @@ -2518,9 +2522,12 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (concat prefix-format method (tramp-postfix-method-format)) (file-name-all-completions (concat prefix-format (substring method 0 1)) "/")))) - ;; Complete host name for default method. - (unless (zerop (length host)) - (let ((tramp-default-method (or method tramp-default-method))) + ;; Complete host name for default method. With gvfs + ;; based methods, host name will be determined as + ;; host.local, so we omit the test. + (let ((tramp-default-method (or method tramp-default-method))) + (unless (or (zerop (length host)) + (tramp--test-gvfs-p tramp-default-method)) (should (member (concat @@ -2534,7 +2541,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." ;; Complete host name. (unless (or (zerop (length method)) (zerop (length (tramp-method-regexp))) - (zerop (length host))) + (zerop (length host)) + (tramp--test-gvfs-p method)) (should (member (concat @@ -3224,10 +3232,11 @@ This does not support globbing characters in file names (yet)." (string-match "ftp$" (file-remote-p tramp-test-temporary-file-directory 'method))) -(defun tramp--test-gvfs-p () +(defun tramp--test-gvfs-p (&optional method) "Check, whether the remote host runs a GVFS based method. This requires restrictions of file name syntax." - (tramp-gvfs-file-name-p tramp-test-temporary-file-directory)) + (or (member method tramp-gvfs-methods) + (tramp-gvfs-file-name-p tramp-test-temporary-file-directory))) (defun tramp--test-hpux-p () "Check, whether the remote host runs HP-UX. @@ -3268,13 +3277,6 @@ This requires restrictions of file name syntax." (or (eq system-type 'windows-nt) (tramp-smb-file-name-p tramp-test-temporary-file-directory))) -(defun tramp--test-afp-or-smb-p () - "Check, whether the afp or smb method is used. -This requires an additional share name." - (or (string-equal - "afp" (file-remote-p tramp-test-temporary-file-directory 'method)) - (tramp-smb-file-name-p tramp-test-temporary-file-directory))) - (defun tramp--test-check-files (&rest files) "Run a simple but comprehensive test over every file in FILES." ;; TODO: The quoted case does not work. commit 792de924d54a0d6d3ac33fddfa9d6698c5ba2110 Author: Michael Albinus Date: Mon Jun 5 12:58:59 2017 +0200 Fix error in Tramp rsync method * lisp/net/tramp-sh.el (tramp-methods) : Add "-c" argument. Otherwise, `tramp-test10-write-region' could fail. diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 2541fcf551..70481ab13b 100644 --- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -200,7 +200,7 @@ The string is used in `tramp-methods'.") (tramp-remote-shell-login ("-l")) (tramp-remote-shell-args ("-c")) (tramp-copy-program "rsync") - (tramp-copy-args (("-t" "%k") ("-p") ("-r") ("-s"))) + (tramp-copy-args (("-t" "%k") ("-p") ("-r") ("-s") ("-c"))) (tramp-copy-env (("RSYNC_RSH") ("ssh" "%c"))) (tramp-copy-keep-date t) (tramp-copy-keep-tmpfile t) commit c0d42853cd9b2da6d2d82f670260b62958ff6d21 Author: Noah Friedman Date: Mon May 8 16:24:56 2017 -0700 (ybuffer-list): $alist must be ptr-unmasked at the end of the loop, because $ptr is modified by ygetptr and we use $ptr immediately at the beginning. diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb index db58eeb8e9..053d7bd69c 100644 --- a/etc/emacs-buffer.gdb +++ b/etc/emacs-buffer.gdb @@ -105,8 +105,6 @@ define ybuffer-list while $alist != $qnil set $this = ((struct Lisp_Cons *) $ptr)->car set $alist = ((struct Lisp_Cons *) $ptr)->u.cdr - ygetptr $alist - set $alist = $ptr # Vbuffer_alist elts are pairs of the form (name . buffer) ygetptr $this @@ -136,6 +134,8 @@ define ybuffer-list end set $i++ + ygetptr $alist + set $alist = $ptr end end document ybuffer-list