------------------------------------------------------------ revno: 116051 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 22:22:55 -0500 message: * lisp/menu-bar.el: Fix author header comment (accidentally omitted from previous commit) diff: === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2014-01-07 16:50:03 +0000 +++ lisp/menu-bar.el 2014-01-17 03:22:55 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1993-1995, 2000-2014 Free Software Foundation, Inc. -;; Author: RMS +;; Author: Richard M. Stallman ;; Maintainer: FSF ;; Keywords: internal, mouse ;; Package: emacs ------------------------------------------------------------ revno: 116050 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 22:21:57 -0500 message: * lisp/emacs-lisp/authors.el (authors-aliases): Remove more unused entries * lisp/leim/quail/tibetan.el, lisp/menu-bar.el: Fix author header comment. diff: === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2014-01-17 02:59:24 +0000 +++ lisp/emacs-lisp/authors.el 2014-01-17 03:21:57 +0000 @@ -62,9 +62,7 @@ ("David O'Toole" "David T. O'Toole") ("Deepak Goel" "D. Goel") ("Ed L. Cashin" "Ed L Cashin") - ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold" - "Reingold Edward M") - ("Eli Zaretskii" "eliz") + ("Edward M. Reingold" "Ed Reingold" "Edward M Reingold" "Reingold Edward M") ("Emilio C. Lopes" "Emilio Lopes") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") @@ -72,7 +70,6 @@ ("François Pinard" "Francois Pinard") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") ("Frederic Pierresteguy" "Fred Pierresteguy") - ("Geoff Voelker" "voelker") ("Gerd Möllmann" "Gerd Moellmann") ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth") ("Hrvoje Nikšić" "Hrvoje Niksic") @@ -97,7 +94,7 @@ ("Kai Großjohann" "Kai Grossjohann") ("Karl Berry" "K. Berry") ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly") - ("Kazushi Marukawa" "Kazushi") + ("Kazushi Marukawa" "Kazushi (Jam) Marukawa") ("Ken Manheimer" "Kenneth Manheimer") ("Kenichi Handa" "Ken'ichi Handa" "Kenichi HANDA") ("Kevin Greiner" "Kevin J. Greiner") @@ -114,13 +111,13 @@ ("Michael R. Mauger" "Michael Mauger") ("Michael D. Ernst" "Michael Ernst") ("Michaël Cadilhac" "Michael Cadilhac") - ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, P/Bsg") + ("Michael I. Bushnell" "Michael I Bushnell" "Michael I. Bushnell, p/BSG") ("Michael R. Cook" "Michael Cook") ("Michael Sperber" "Michael Sperber \\[Mr. Preprocessor\\]") ("Mikio Nakajima" "Nakajima Mikio") ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") ("Noorul Islam" "Noorul Islam K M") - ("Paul Eggert" "eggert") + ("Paul Eggert" "Paul R\\. Eggert") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") ("Pavel Kobiakov" "Pavel Kobyakov") ("Per Abrahamsen" "Per Abhiddenware") @@ -133,7 +130,7 @@ ("Raja R. Harinath" "Raja R Harinath") ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski") ("Richard King" "Dick King") - ("Richard M. Stallman" "Richard Stallman" "rms" "rms@gnu.org") + ("Richard M. Stallman" "Richard Stallman" "rms@gnu.org") ("Robert J. Chassell" "Bob Chassell") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}") @@ -158,7 +155,7 @@ ("Tomohiko Morioka" "MORIOKA Tomohiko") ("Torbjörn Axelsson" "Torbjvrn Axelsson") ("Torbjörn Einarsson" "Torbj.*rn Einarsson") - ("Toru Tomabechi" "Toru Tomabechi,") + ("Toru Tomabechi" "Toru TOMABECHI") ("Tsugutomo Enami" "enami tsugutomo") ("Ulrich Müller" "Ulrich Mueller") ("Vincent Del Vecchio" "Vince Del Vecchio") === modified file 'lisp/leim/quail/tibetan.el' --- lisp/leim/quail/tibetan.el 2014-01-01 07:43:34 +0000 +++ lisp/leim/quail/tibetan.el 2014-01-17 03:21:57 +0000 @@ -23,7 +23,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;; Author: Toru TOMABECHI, +;; Author: Toru TOMABECHI ;; Created: Feb. 17. 1997 ------------------------------------------------------------ revno: 116049 committer: Dmitry Gutov branch nick: trunk timestamp: Fri 2014-01-17 05:15:02 +0200 message: ruby-mode: Align def...end to the beginning of statement * lisp/progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. (ruby-align-to-stmt-keywords): Change the default value. Use `ruby-alignable-keywords' to generate the possible customization choices. (ruby-smie-rules): Instead of using a hardcoded list of alignable keywords, check against the value of `ruby-alignable-keywords' (http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01439.html). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 02:59:24 +0000 +++ lisp/ChangeLog 2014-01-17 03:15:02 +0000 @@ -1,3 +1,13 @@ +2014-01-17 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-alignable-keywords): New constant. + (ruby-align-to-stmt-keywords): Change the default value. Use + `ruby-alignable-keywords' to generate the possible customization + choices. + (ruby-smie-rules): Instead of using a hardcoded list of alignable + keywords, check against the value of `ruby-alignable-keywords' + (http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01439.html). + 2014-01-17 Glenn Morris * emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2014-01-10 16:32:45 +0000 +++ lisp/progmodes/ruby-mode.el 2014-01-17 03:15:02 +0000 @@ -226,7 +226,10 @@ :group 'ruby :safe 'integerp) -(defcustom ruby-align-to-stmt-keywords nil +(defconst ruby-alignable-keywords '(if while unless until begin case for def) + "Keywords that can be used in `ruby-align-to-stmt-keywords'.") + +(defcustom ruby-align-to-stmt-keywords '(def) "Keywords after which we align the expression body to statement. When nil, an expression that begins with one these keywords is @@ -250,17 +253,13 @@ Only has effect when `ruby-use-smie' is t. " - :type '(choice + :type `(choice (const :tag "None" nil) (const :tag "All" t) (repeat :tag "User defined" - (choice (const if) - (const while) - (const unless) - (const until) - (const begin) - (const case) - (const for)))) + (choice ,@(mapcar + (lambda (kw) (list 'const kw)) + ruby-alignable-keywords)))) :group 'ruby :safe 'listp :version "24.4") @@ -639,7 +638,7 @@ (smie-indent--hanging-p) ruby-indent-level)) (`(:after . ,(or "?" ":")) ruby-indent-level) - (`(:before . ,(or "if" "while" "unless" "until" "begin" "case" "for")) + (`(:before . ,(guard (memq (intern-soft token) ruby-alignable-keywords))) (when (not (ruby--at-indentation-p)) (if (ruby-smie--indent-to-stmt-p token) (ruby-smie--indent-to-stmt) === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2013-12-22 06:04:40 +0000 +++ test/indent/ruby.rb 2014-01-17 03:15:02 +0000 @@ -331,6 +331,10 @@ end end +private def foo + bar +end + %^abc^ ddd ------------------------------------------------------------ revno: 116048 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 21:59:24 -0500 message: * lisp/emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries. * lisp/jka-cmpr-hook.el, lisp/jka-compr.el, lisp/progmodes/antlr-mode.el: * doc/misc/autotype.texi: Fix author header comments. * lisp/org/ChangeLog: ChangeLog fix. diff: === modified file 'doc/misc/autotype.texi' --- doc/misc/autotype.texi 2014-01-10 07:10:37 +0000 +++ doc/misc/autotype.texi 2014-01-17 02:59:24 +0000 @@ -1,6 +1,6 @@ \input texinfo @c This is an annex of the Emacs manual. -@c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389 +@c Author: Daniel Pfeiffer @setfilename ../../info/autotype @c @node Autotypist, Picture, Abbrevs, Top @c @chapter Features for Automatic Typing === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-17 02:11:36 +0000 +++ lisp/ChangeLog 2014-01-17 02:59:24 +0000 @@ -1,5 +1,7 @@ 2014-01-17 Glenn Morris + * emacs-lisp/authors.el (authors-aliases): Remove unnecessary entries. + Make M-x authors return zero *Authors Errors* from current logs. * emacs-lisp/authors.el (authors-obsolete-files-regexps): (authors-ignored-files): Add some entries, remove others. === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2014-01-17 02:11:36 +0000 +++ lisp/emacs-lisp/authors.el 2014-01-17 02:59:24 +0000 @@ -53,15 +53,11 @@ ("Brian Fox" "Brian J. Fox") ("Brian P Templeton" "BT Templeton") ("Brian Sniffen" "Brian T. Sniffen") - ("Christoph Wedler" "Christoph.Wedler@sap.com") - ("Daniel Pfeiffer" "" - "") ("David Abrahams" "Dave Abrahams") ("David De La Harpe Golden" "David Golden") ("David Gillespie" "Dave Gillespie") ("David Kågedal" "David K..edal") - ("David M. Koppelman" "David M. Koppelman, Koppel@Ec?e.Lsu.Edu" - "David Koppelman") + ("David M. Koppelman" "David Koppelman") ("David M. Smith" "David Smith" "David M Smith") ("David O'Toole" "David T. O'Toole") ("Deepak Goel" "D. Goel") @@ -70,10 +66,8 @@ "Reingold Edward M") ("Eli Zaretskii" "eliz") ("Emilio C. Lopes" "Emilio Lopes") - ("Era Eriksson" "Era@Iki.Fi") ("Eric M. Ludlam" "Eric Ludlam") ("Eric S. Raymond" "Eric Raymond") - ("Eric Youngdale" "(Eric Youngdale at youngdale@v6550c.nrl.navy.mil)") ("Francis J. Wright" "Dr Francis J. Wright" "Francis Wright") ("François Pinard" "Francois Pinard") ("Francesco Potortì" "Francesco Potorti" "Francesco Potorti`") @@ -84,18 +78,10 @@ ("Hrvoje Nikšić" "Hrvoje Niksic") ;; lisp/org/ChangeLog 2010-11-11. (nil "aaa bbb") - ;; src/ChangeLog.4, 1994-01-11, since fixed. -;;; (nil "(afs@hplb.hpl.hp.com)") - ;; lisp/gnus/ChangeLog.1, 1998-01-15. - ;; http://quimby.gnus.org/cgi-bin/cvsweb.cgi/gnus/lisp/gnus-art.el?rev=4.13 - (nil "") (nil "Code Extracted") ; lisp/newcomment.el's "Author:" header - (nil "\\`FSF") ; FIXME what is this for - no effect? - ;; lisp/gnus/ChangeLog.1, 1997-10-12, since fixed. -;;; (nil "ISO-2022-JP") ("Jaeyoun Chung" "Jae-youn Chung" "Jae-you Chung" "Chung Jae-youn") ("Jan Djärv" "Jan D." "Jan Djarv") - ("Jay K. Adams" "jka@ece.cmu.edu" "Jay Adams") + ("Jay K. Adams" "Jay Adams") ("Jérôme Marant" "Jérôme Marant" "Jerome Marant") ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard") @@ -108,9 +94,7 @@ ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ? ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia") ("K. Shane Hartman" "Shane Hartman") - ("Kai Großjohann" "Kai Grossjohann" "Kai Großjohann" - "Kai.Grossjohann@Cs.Uni-Dortmund.De" - "Kai.Grossjohann@Gmx.Net") + ("Kai Großjohann" "Kai Grossjohann") ("Karl Berry" "K. Berry") ("Károly Lőrentey" "Károly Lőrentey" "Lőrentey Károly") ("Kazushi Marukawa" "Kazushi") @@ -137,32 +121,28 @@ ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") ("Noorul Islam" "Noorul Islam K M") ("Paul Eggert" "eggert") - ("Paul Reilly" "(pmr@legacy.pajato.com)") - ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik" "Pavel Janík" "Pavel@Janik.Cz") + ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") ("Pavel Kobiakov" "Pavel Kobyakov") ("Per Abrahamsen" "Per Abhiddenware") ("Per Starbäck" "Per Starback") ("Peter J. Weisberg" "PJ Weisberg") - ("Peter S. Galbraith" "Peter Galbraith") + ("Peter S. Galbraith" "Peter S Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") - ("Peter S. Galbraith" "Peter S Galbraith") ("Piotr Zieliński" "Piotr Zielinski") ("Rainer Schöpf" "Rainer Schoepf") ("Raja R. Harinath" "Raja R Harinath") ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski") ("Richard King" "Dick King") - ("Richard M. Stallman" "Richard M. Stallman,,," "Richard Stallman" - "rms" "rms@gnu.org") + ("Richard M. Stallman" "Richard Stallman" "rms" "rms@gnu.org") ("Robert J. Chassell" "Bob Chassell") ("Roland B. Roberts" "Roland B Roberts" "Roland Roberts") - ("Rui-Tao Dong" "Rui-Tao Dong ~{6-Hpln~}") + ("Rui-Tao Dong" "Rui-Tao Dong ~{6-HpLN~}") ("Sacha Chua" "Sandra Jean Chua") ("Sam Steingold" "Sam Shteingold") ("Satyaki Das" "Indexed search by Satyaki Das") ("Sébastien Vauban" "Sebastien Vauban") ;; There are other Stefans. ;;; ("Stefan Monnier" "Stefan") - ("Stephen A. Wood" "(saw@cebaf.gov)") ("Steven L. Baur" "SL Baur" "Steven L Baur") ("Stewart M. Clamen" "Stewart Clamen") ("Stuart D. Herring" "Stuart Herring" "Davis Herring") === modified file 'lisp/jka-cmpr-hook.el' --- lisp/jka-cmpr-hook.el 2014-01-01 07:43:34 +0000 +++ lisp/jka-cmpr-hook.el 2014-01-17 02:59:24 +0000 @@ -1,9 +1,9 @@ ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el -;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2014 Free Software -;; Foundation, Inc. +;; Copyright (C) 1993-1995, 1997, 1999-2000, 2002-2014 +;; Free Software Foundation, Inc. -;; Author: jka@ece.cmu.edu (Jay K. Adams) +;; Author: Jay K. Adams ;; Maintainer: FSF ;; Keywords: data ;; Package: emacs === modified file 'lisp/jka-compr.el' --- lisp/jka-compr.el 2014-01-01 07:43:34 +0000 +++ lisp/jka-compr.el 2014-01-17 02:59:24 +0000 @@ -1,9 +1,8 @@ ;;; jka-compr.el --- reading/writing/loading compressed files -;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation, -;; Inc. +;; Copyright (C) 1993-1995, 1997, 1999-2014 Free Software Foundation, Inc. -;; Author: jka@ece.cmu.edu (Jay K. Adams) +;; Author: Jay K. Adams ;; Maintainer: FSF ;; Keywords: data === modified file 'lisp/org/ChangeLog' --- lisp/org/ChangeLog 2014-01-15 08:49:38 +0000 +++ lisp/org/ChangeLog 2014-01-17 02:59:24 +0000 @@ -21092,7 +21092,7 @@ 2010-11-11 aaa bbb * org-archive.el (org-get-local-archive-location): - Use `org-carchive-location' as default. + Use `org-archive-location' as default. 2010-11-11 Eric Schulte === modified file 'lisp/progmodes/antlr-mode.el' --- lisp/progmodes/antlr-mode.el 2014-01-01 07:43:34 +0000 +++ lisp/progmodes/antlr-mode.el 2014-01-17 02:59:24 +0000 @@ -2,7 +2,7 @@ ;; Copyright (C) 1999-2014 Free Software Foundation, Inc. -;; Author: Christoph.Wedler@sap.com +;; Author: Christoph Wedler ;; Keywords: languages, ANTLR, code generator ;; Version: 2.2c ;; X-URL: http://antlr-mode.sourceforge.net/ ------------------------------------------------------------ revno: 116047 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 21:11:36 -0500 message: Make M-x authors return zero *Authors Errors* from current logs * lisp/emacs-lisp/authors.el (authors-obsolete-files-regexps): (authors-ignored-files): Add some entries, remove others. (authors-ambiguous-files, authors-valid-file-names): Add some entries. (authors-renamed-files-alist): Add, remove, and adjust entries. (authors-renamed-files-regexps): Add some entries. Remove some very broad ones. Make some entries `lax'. (authors-lax-changelogs): New constant. (authors-disambiguate-file-name): Treat top-level specially. (authors-lax-changelog-p): New function. (authors-canonical-file-name): Check file as written against authors-valid-file-names. Do not special-case etc/. Handle `lax' logs and authors-renamed-files-regexps elements. * admin/make-tarball.txt: Update for no expected *Authors Errors*. diff: === modified file 'admin/make-tarball.txt' --- admin/make-tarball.txt 2013-08-15 06:38:44 +0000 +++ admin/make-tarball.txt 2014-01-17 02:11:36 +0000 @@ -28,14 +28,10 @@ M-: (require 'authors) RET M-x authors RET - There is almost guaranteed to be an "*Authors Errors*" buffer with - problems caused by certain bad ChangeLog entries. You can ignore - the very old ones (eg lisp/erc has a lot). If there are errors - related to new entries (especially entries that are new since the - last pretest), see if you can fix them. If there was a ChangeLog - typo, fix it. If a file was deleted or renamed, consider adding - an appropriate entry to authors-ignored-files, authors-valid-file-names, - or authors-renamed-files-alist. + If there is an "*Authors Errors*" buffer, address the issues. + If there was a ChangeLog typo, fix it. If a file was deleted or + renamed, consider adding an appropriate entry to authors-ignored-files, + authors-valid-file-names, or authors-renamed-files-alist. If necessary, repeat M-x authors after making those changes. Save the "*Authors*" buffer as etc/AUTHORS. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-16 16:44:17 +0000 +++ lisp/ChangeLog 2014-01-17 02:11:36 +0000 @@ -1,3 +1,20 @@ +2014-01-17 Glenn Morris + + Make M-x authors return zero *Authors Errors* from current logs. + * emacs-lisp/authors.el (authors-obsolete-files-regexps): + (authors-ignored-files): Add some entries, remove others. + (authors-ambiguous-files, authors-valid-file-names): + Add some entries. + (authors-renamed-files-alist): Add, remove, and adjust entries. + (authors-renamed-files-regexps): Add some entries. + Remove some very broad ones. Make some entries `lax'. + (authors-lax-changelogs): New constant. + (authors-disambiguate-file-name): Treat top-level specially. + (authors-lax-changelog-p): New function. + (authors-canonical-file-name): Check file as written against + authors-valid-file-names. Do not special-case etc/. + Handle `lax' logs and authors-renamed-files-regexps elements. + 2014-01-16 Dmitry Gutov * emacs-lisp/package.el (package-desc--keywords): Use `cdr' with === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2014-01-10 20:19:31 +0000 +++ lisp/emacs-lisp/authors.el 2014-01-17 02:11:36 +0000 @@ -246,15 +246,15 @@ (defvar authors-obsolete-files-regexps - '("vc-\\*\\.el$" - "spec.txt$" - ".*loaddefs.el$" ; not obsolete, but auto-generated + '(".*loaddefs.el$" ; not obsolete, but auto-generated "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting "\\.arch-inventory$" ;; TODO lib/? Matches other things? - "build-aux/" "m4/" "Emacs.xcodeproj" "charsets" "mapfiles" + "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" "preferences\\.\\(nib\\|gorm\\)" - "vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el$") + ;; Generated files that have since been removed. + "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\ +gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'") "List of regexps matching obsolete files. Changes to files matching one of the regexps in this list are not listed.") @@ -269,14 +269,19 @@ "NEWS.1" "OOOOONEWS...OONEWS" "OOOONEWS" "etc/NEWS" "NEWS.1-17" "NEWS.18" "NEWS.19" "NEWS.20" "NEWS.21" "NEWS.22" "MAINTAINERS" "MH-E-NEWS" - "install-sh" "missing" "mkinstalldirs" + "install.sh" "install-sh" "missing" "mkinstalldirs" "termcap.dat" "termcap.src" "termcap.ucb" "termcap" "ChangeLog.nextstep" "Emacs.clr" "spec.txt" "gfdl.1" "texi/Makefile.in" "Imakefile" "icons/sink.ico" "aixcc.lex" "nxml/char-name/unicode" + "spec.txt" "js2-mode.el" ; only installed very briefly, replaced by js.el + ;; In the old imported lisp/url ChangeLog, but never in Emacs. + "mule-sysdp.el" + ;; Only briefly present. + "tests/gnustest-nntp.el" "tests/gnustest-registry.el" "cedet/tests/testtemplates.cpp" "cedet/tests/testusing.cpp" "cedet/tests/scopetest.cpp" @@ -286,7 +291,7 @@ "cedet/tests/teststruct.cpp" "*.el" ;; Autogen: - "cus-load.el" "finder-inf.el" "ldefs-boot.el" + "cus-load.el" "finder-inf.el" "ldefs-boot.el" "loaddefs-boot.el" "compile" "config.guess" "config.sub" "depcomp" "autogen/compile" "autogen/config.guess" "autogen/config.in" "autogen/config.sub" "autogen/depcomp" "autogen/install-sh" @@ -302,6 +307,8 @@ "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat" "CXTERM-DIC/PY.tit" "CXTERM-DIC/ZIRANMA.tit" "CXTERM-DIC/CTLau.tit" "CXTERM-DIC/CTLauB.tit" + "copying.paper" "celibacy.1" "condom.1" "echo.msg" "sex.6" + "COOKIES" "INTERVIEW" "MAILINGLISTS" "MOTIVATION" "NICKLES.WORTH" "INTERVAL.IDEAS" "RCP" "3B-MAXMEM" "AIX.DUMP" "SUN-SUPPORT" "XENIX" "CODINGS" "CHARSETS" @@ -344,23 +351,21 @@ "debian/scripts/startup.erc-speak" ;; Used to be in admin, not very interesting. "emacs-pretesters" "make-announcement" "make-changelog-diff" - ;; Generated files that have since been removed. - "refcards/calccard.pdf" "refcards/cs-dired-ref.pdf" "refcards/cs-refcard.pdf" - "refcards/de-refcard.pdf" "refcards/dired-ref.pdf" "refcards/fr-dired-ref.pdf" - "refcards/fr-refcard.pdf" "refcards/gnus-booklet.pdf" "refcards/gnus-refcard.pdf" - "refcards/orgcard.pdf" "refcards/pl-refcard.pdf" "refcards/pt-br-refcard.pdf" - "refcards/refcard.pdf" "refcards/ru-refcard.pdf" "refcards/sk-dired-ref.pdf" - "refcards/sk-refcard.pdf" + ;; Textual comments that are not files. + "All" "Version" "Everywhere" "Many" "Various" "files" + ;; Directories. + "vms" "mac" "url" "tree-widget" ) "List of files and directories to ignore. Changes to files in this list are not listed.") ;; List via: find . -name '*.el' | sed 's/.*\///g' | sort | uniq -d ;; FIXME It would be better to discover these dynamically. -;; Note that traditionally "Makefile.in" etc have not been in this list. -;; Ditto for "abbrev.texi" etc. (defconst authors-ambiguous-files - '("chart.el" + '("Makefile.in" + "makefile.w32-in" + "chart.el" + "cl-lib.el" "compile.el" "complete.el" "cpp.el" @@ -379,11 +384,13 @@ "format.el" "generic.el" "georgian.el" + "grammar.el" "greek.el" "grep.el" "hebrew.el" "imenu.el" "indian.el" + "info-xref.el" "japanese.el" "java.el" "lao.el" @@ -391,6 +398,7 @@ "locate.el" "make.el" "mode.el" + "mule-util.el" "python.el" "rmailmm.el" "semantic.el" @@ -403,6 +411,7 @@ "table.el" "texi.el" "thai.el" + "thingatpt.el" "tibetan.el" "util.el" "vc-bzr.el" @@ -575,12 +584,19 @@ (defconst authors-valid-file-names '("aclocal.m4" "build-ins.in" + "Makefile" "Makefile.noleim" "makedist.bat" "makefile.def" "makefile.nt" "ns.mk" + "README" + ;; There were a few of these, not just the generated top-level one. + "configure" "config.h" + ;; nt/ + "ebuild.bat" "install.bat" "fast-install.bat" "debug.bat.in" "emacs.bat.in" + "inc/sys/dir.h" "inc/gettext.h" ".gdbinit-union" "alloca.s" "make-delta" @@ -603,16 +619,84 @@ "emacs16_mac.png" "emacs24_mac.png" "emacs256_mac.png" "emacs32_mac.png" "emacs48_mac.png" "emacs512_mac.png" + "ps-prin2.ps" "ps-prin3.ps" + "emacs.xbm" "gnu.xpm" "gnus-pointer.xbm" "gnus-pointer.xpm" + ;; Moved from etc/ to etc/images, and/or removed. + "gnus.pbm" "gnus.xbm" "gnus.xpm" "letter.pbm" "letter.xbm" "letter.xpm" + "splash.pbm" "splash.xbm" "splash.xpm" "splash8.xpm" + "images/execute.pbm" "images/execute.xpm" "images/fld-open.pbm" + "images/fld-open.xpm" "images/highlight.pbm" "images/highlight.xpm" + "images/mail.pbm" "images/mail.xpm" "images/mail/alias.pbm" + "images/mail/alias.xpm" "images/mail/refile.pbm" + "images/mail/refile.xpm" "images/page-down.pbm" + "images/page-down.xpm" "images/widen.pbm" "images/widen.xpm" + "images/gnus/bar.xbm" "images/gnus/bar.xpm" + "images/gnus/reverse-smile.xpm" "revdiff" ; admin/ "vcdiff" "rcs-checkin" "tindex.pl" "mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/ "mac-fix-env.m" ;; Deleted vms stuff: "temacs.opt" "descrip.mms" "compile.com" "link.com" + "compact.el" "fadr.el" + "calc/calc-maint.el" + "emacs-lisp/eieio-comp.el" + "erc-hecomplete.el" + "eshell/esh-maint.el" + "language/persian.el" + "meese.el" + "mh-exec.el" "mh-init.el" "mh-customize.el" + "net/zone-mode.el" "xesam.el" + "term/mac-win.el" "sup-mouse.el" + "url-https.el" + "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el" + "org-mks.el" "org-remember.el" "org-xoxo.el" "org-docbook.el" + "org-freemind.el" "ox-jsinfo.el" + "org-exp-blocks.el" ; maybe this is ob-exp now? dunno + "org-lparse.el" + "org-special-blocks.el" "org-taskjuggler.el" + ;; gnus + "nnwfm.el" "nnlistserv.el" "nnkiboze.el" "nndb.el" "nnsoup.el" + "netrc.el" "password.el" "sasl-cram.el" "sasl-digest.el" "sasl-ntlm.el" + "sasl.el" "dig.el" "dns.el" "hex-util.el" "sha1.el" "md4.el" + "hmac-def.el" "hmac-md5.el" "ntlm.el" "hashcash.el" "smime-ldap.el" + "assistant.el" "gnus-utils.el" "tls.el" "pgg-def.el" "pgg-gpg.el" + "gnus-compat.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" "pgg.el" + "dns-mode.el" "run-at-time.el" "gnus-encrypt.el" "sha1-el.el" + "gnus-gl.el" "gnus.sum.el" "proto-stream.el" "color.el" "color-lab.el" + "eww.el" "shr-color.el" "shr.el" "earcon.el" "gnus-audio.el" "encrypt.el" + ;; doc + "getopt.c" "texindex.c" "news.texi" "vc.texi" "vc2-xtra.texi" + "back.texi" "vol1.texi" "vol2.texi" "elisp-covers.texi" "two.el" + "front-cover-1.texi" "locals.texi" "calendar.texi" "info-stnd.texi" + "tasks.texi" + "advice.texi" "picture.texi" "texinfo.tex" + ;; lwlib: + "dispatch.c" "dispatch.h" "xrdb-cpp.c" "xrdb.c" + "lwlib-Xol.c" "lwlib-Xol.h" "lwlib-Xolmb.c" "lwlib-Xolmb.h" + "lwlib-XolmbP.h" + ;; lib/ + "lib/stdio.c" "lib/gl_openssl.h" "lib/sigprocmask.c" + "lib/pthread_sigprocmask.c" "lib/ldtoastr.c" "lib/dummy.c" + "lib/ignore-value.h" + ;; lib-src/ + "cvtmail.c" "digest-doc.c" "emacsserver.c" "emacstool.c" "env.c" + "etags-vmslib.c" "fakemail.c" "getdate.c" "getopt.h" "getopt1.c" + "getopt_.h" "getopt_int.h" "gettext.h" "leditcfns.c" "loadst.c" + "make-path.c" "qsort.c" "sorted-doc.c" "tcp.c" "timer.c" "wakeup.c" + "yow.c" + ;; etc/ + "emacsclient.c" "etags.c" "hexl.c" "make-docfile.c" "movemail.c" + "tpu-doc.el" ; FIXME? renamed to something? ) "File names which are valid, but no longer exist (or cannot be found) in the repository.") +;; Note that any directory part on the RHS is retained. +;; Cf authors-renamed-files-regexps. +;; NB So only add a directory if needed to disambiguate. +;; FIXME? +;; Although perhaps we could let authors-disambiguate-file-name do that? (defconst authors-renamed-files-alist '(("nt.c" . "w32.c") ("nt.h" . "w32.h") ("ntheap.c" . "w32heap.c") ("ntheap.h" . "w32heap.h") @@ -622,15 +706,28 @@ ("unexnt.c" . "unexw32.c") ("s/windowsnt.h" . "s/ms-w32.h") ("s/ms-w32.h" . "inc/ms-w32.h") + ("src/config.h" . "config.h") ("winnt.el" . "w32-fns.el") + ("linux.h" . "gnu-linux.h") ("emacs.manifest" . "emacs-x86.manifest") ("config.emacs" . "configure") ("configure.in" . "configure.ac") ("config.h.dist" . "config.in") ("config.h-dist" . "config.in") ("config.h.in" . "config.in") - ("paths.h-dist" . "paths.h.in") + ("debug.bat" . "debug.bat.in") + ("emacs.bat" . "emacs.bat.in") + ;; paths.h.dist -> paths.h-dist -> paths.h.in -> paths.in -> epaths.in. + ("paths.h.dist" . "epaths.in") + ("paths.h-dist" . "epaths.in") + ("paths.h.in" . "epaths.in") + ("paths.in" . "epaths.in") ("patch1" . "sed1.inp") + ("INSTALL.MSYS" . "INSTALL") + ("server.c" . "emacsserver.c") + ("lib-src/etags.c" . "etags.c") + ;; msdos/ + ("is-exec.c" . "is_exec.c") ("enriched.doc" . "enriched.txt") ("GETTING.GNU.SOFTWARE" . "FTP") ("etc/MACHINES" . "MACHINES") @@ -649,38 +746,71 @@ ("leim-Makefile.in" . "leim/Makefile.in") ("emacs-lisp/testcover-ses.el" . "tcover-ses.el") ("emacs-lisp/testcover-unsafep.el" . "tcover-unsafep.el") + ("progmodes/dos.el" . "bat-mode.el") ;; index and pick merged into search. ("mh-index.el" . "mh-search.el") ("mh-pick.el" . "mh-search.el") ("font-setting.el" . "dynamic-setting.el") - ;; INSTALL-CVS -> .CVS -> .BZR - ("INSTALL-CVS" . "INSTALL.BZR") - ("INSTALL.CVS" . "INSTALL.BZR") + ("help-funs.el" . "help-fns.el") + ("erc-notifications.el" . "erc-desktop-notifications.el") + ("org-complete.el" . "org-pcomplete.el") + ("org-export.el" . "ox.el") ; ? + ;; Was definitely renamed to org-latex.el, then... ? + ("org-export-latex.el" . "ox-latex.el") ; ? + ("org-exp.el" . "ox.el") ; ? + ("progmodes/cfengine3.el" . "cfengine.el") + ;; Obsolete. + ("play/bruce.el" . "bruce.el") + ("patcomp.el" . "patcomp.el") + ;; From lisp to etc/forms. + ("forms-d2.el" . "forms-d2.el") + ("forms-pass.el" . "forms-pass.el") + ;; From lisp/ to etc/nxml. + ("nxml/test.invalid.xml" . "test-invalid.xml") + ("nxml/test.valid.xml" . "test-valid.xml") + ;; The one in lisp is eshell/eshell.el. + ("eshell.el" . "automated/eshell.el") + ("eshell/esh-test.el" . "automated/eshell.el") + ;; INSTALL-CVS -> .CVS -> .BZR -> .REPO + ("INSTALL-CVS" . "INSTALL.REPO") + ("INSTALL.CVS" . "INSTALL.REPO") ("INSTALL.BZR" . "INSTALL.REPO") - ("refcards/fr-drdref.pdf" . "refcards/fr-dired-ref.pdf") - ("gnus-logo.eps" . "refcards/gnus-logo.eps") + ("gnus-logo.eps" . "gnus-logo.eps") ; moved to refcards/ ("build-install" . "build-ins.in") ("build-install.in" . "build-ins.in") ("unidata/Makefile" . "unidata/Makefile.in") - ("move-if-change" . "build-aux/move-if-change") - ("update-subdirs" . "build-aux/update-subdirs") + ;; Moved from top to etc/ + ("CONTRIBUTE" . "CONTRIBUTE") + ("FTP" . "FTP") + ;; Moved from top to build-aux/ + ("move-if-change" . "move-if-change") + ("update-subdirs" . "update-subdirs") + ("emacs.tex" . "emacs.texi") + ("faq.texi" . "efaq.texi") + ("major.texi" . "modes.texi") + ;; And from emacs/ to misc/ and back again. + ("ns-emacs.texi" . "macos.texi") + ("overrides.texi" . "gnus-overrides.texi") + ("xresmini.texi" . "xresources.texi") ;; Not renamed, but we only have the latter in the Emacs repo. ("trampver.texi.in" . "trampver.texi") - ("e/eterm" . "e/eterm-color") - ("e/eterm.ti" . "e/eterm-color.ti") + ;; Renamed with same directory. + ("e/eterm" . "eterm-color") + ("e/eterm.ti" . "eterm-color.ti") ("README.txt" . "README") ("emacs.names" . "JOKES") ("ED.WORSHIP" . "JOKES") ("GNU.JOKES" . "JOKES") ("CHARACTERS" . "TODO") - ("schema/xhtml-basic-form.rnc" . "schema/xhtml-bform.rnc" ) - ("schema/xhtml-basic-table.rnc" . "schema/xhtml-btable.rnc") - ("schema/xhtml-list.rnc" . "schema/xhtml-lst.rnc") - ("schema/xhtml-target.rnc" . "schema/xhtml-tgt.rnc") - ("schema/xhtml-style.rnc" . "schema/xhtml-xstyle.rnc") - ("schema/docbook-dyntbl.rnc" . "schema/docbk-dyntbl.rnc") - ("schema/docbook-soextbl.rnc" . "schema/docbk-soextbl.rn" ) - ("texi/url.txi" . "url.texi") + ("images/gnus/mail_send.xpm" . "mail-send.xpm") ; still in images/gnus + ;; Renamed within same directory. + ("schema/xhtml-basic-form.rnc" . "xhtml-bform.rnc" ) + ("schema/xhtml-basic-table.rnc" . "xhtml-btable.rnc") + ("schema/xhtml-list.rnc" . "xhtml-lst.rnc") + ("schema/xhtml-target.rnc" . "xhtml-tgt.rnc") + ("schema/xhtml-style.rnc" . "xhtml-xstyle.rnc") + ("schema/docbook-dyntbl.rnc" . "docbk-dyntbl.rnc") + ("schema/docbook-soextbl.rnc" . "docbk-soextbl.rn" ) ("edt-user.doc" . "edt.texi") ("DEV-NOTES" . "nextstep") ("org/COPYRIGHT-AND-LICENSE" . "org/README") @@ -696,61 +826,158 @@ ("autogen/update_autogen" . "update_autogen") ;; Moved from etc/ to admin/. ("grammars" . "grammars") + ;; From etc to lisp/cedet/semantic/. + ("grammars/bovine-grammar.el" . "bovine/grammar.el") + ("grammars/wisent-grammar.el" . "wisent/grammar.el") ;; Moved from admin/nt/ to nt/. ("nt/README.W32" . "README.W32") ) "Alist of files which have been renamed during their lifetime. Elements are (OLDNAME . NEWNAME).") +;; Should still test that the renamed file exists. Does it? +;; But it might be relative to a different ChangeLog... +;; +;; Note that only the basename of the RHS is used. +;; Cf authors-renamed-files-alist. (defconst authors-renamed-files-regexps - '(("^m/m-\\(.*\\.h\\)$" . "m/\\1") - ("^m-\\(.*\\.h\\)$" . "\\1") - ("^s/s-\\(.*\\.h\\)$" . "s/\\1") - ("^s-\\(.*\\.h\\)$" . "\\1") - ("^s/[-.a-zA-Z0-9_]+\\.h$" . t) - ("\\(.*\\)\\.cmd$" . "\\1.bat") - ("\\.bat$" . t) - ("\\.[ch]$" . t) - ("\\.el$" . t) - ("\\.ps$" . t) - ("\\.texi?$" . t) - ("\\.texinfo$" . t) - ("\\.xml?$" . t) - ("\\.x[pb]m$" . t) - ("\\.[xp]bm$" . t) - ("^paths\\." . t) - ("^install\\." . t) - ("^\\(TUTORIAL[^/]*\\)" . "tutorials/\\1") - ("^\\(tree-widget/\\(?:default\\|folder\\)/[-a-z]+\\.png\\)$" . + '(("\\`\\(arg-nonnull\\|c\\+\\+defs\\|warn-on-use\\)\\.h\\'" + "build-aux/snippet/\\&") + ("\\`\\(ebuild\\|emacs\\|install\\|fast-install\\)\\.cmd\\'" "\\1.bat") + ("\\`\\(book-spine\\|cl\\|forms\\|functions\\|gnus\\|sc\\|texinfo\\|vip\\)\ +\\.texinfo\\'" "\\1.texi") + ("\\`\\(\\(calc\\|org\\|vip\\)card\\|viperCard\\|\ +\\(\\(cs\\|fr\\|sk\\)-\\)?dired-ref\\|\ +\\(\\(cs\\|de\\|fr\\|gnus\\|pl\\|pt-br\\|ru\\|sk\\)-\\)?refcard\\|\ +\\(\\(cs\\|fr\\|sk\\)-\\)?survival\\)\\.tex\\'" "refcards/\\&") + ("\\`refcard-\\(de\\|pl\\)\\.tex\\'" "refcards/\\1-refcard.tex") + ("\\`\\(refcards/\\)?fr-drdref\\.tex\\'" "refcards/fr-dired-ref.tex") + ("^\\(TUTORIAL[^/]*\\)" "tutorials/\\1") + ("\\`themes/dev-\\(tsdh-\\(?:light\\|dark\\)-theme\\.el\\)\\'" + "themes/\\1") + ;; Moved from lisp/toolbar to etc/images. + ("\\`toolbar/\\(back\\|fwd\\|left\\|right\\|up\\)_arrow\ +\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/\\1-arrow\\2") + ("\\`toolbar/lc-\\(back\\|fwd\\|left\\|right\\|up\\)_arrow\ +\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/low-color/\\1-arrow\\2") + ("\\`toolbar/mail_\\(compose\\|send\\)\\(\\.[xp]bm\\)\\'" + "images/mail/\\1") + ("\\`toolbar/jump_to\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/jump-to\\1") + ("\\`toolbar/lc-jump_to\\(\\.\\(?:pb\\|xp\\)m\\)\\'" + "images/low-color/jump-to\\1") + ("\\`toolbar/\\(attach\\|cancel\\|close\\|copy\\|cut\\|\ +diropen\\|exit\\|help\\|home\\|index\\|info\\|mail\\|new\\|open\\|\ +paste\\|preferences\\|print\\|save\\|saveas\\|search\\|search-replace\\|\ +spell\\|undo\\)\\(\\.\\(?:pb\\|xp\\)m\\)\\'" "images/\\1\\2") + ("\\`toolbar/gud-\\(break\\|cont\\|down\\|finish\\|print\\|pstar\\|\ +remove\\|run\\|until\\|up\\|watch\\)\\(\\.\\(?:pb\\|xp\\)m\\)\\'" + "images/gud/\\1\\2") + ("\\`\\(toolbar/gud-\\|images/gud/\\)n\\(i\\)?\\(\\.\\(?:pb\\|xp\\)m\\)\\'" + "images/gud/next\\2\\3") + ("\\`\\(toolbar/gud-\\|images/gud/\\)s\\(i\\)?\\(\\.\\(?:pb\\|xp\\)m\\)\\'" + "images/gud/step\\2\\3") + ("\\`toolbar/lc-\\([-a-z]+\\.xpm\\)\\'" "images/low-color/\\1") + ("^\\(tree-widget/\\(?:default\\|folder\\)/[-a-z]+\\.\\(png\\|xpm\\)\\)$" "images/\\1") - ("^\\(images/icons/\\)mac\\(emacs\\)_\\([0-9]+\\)\\(\\.png\\)" . + ("^\\(images/icons/\\)mac\\(emacs\\)_\\([0-9]+\\)\\(\\.png\\)" "\\1\\2\\3_mac\\4") - ("\\(images/icons/\\)emacs_\\([0-9][0-9]\\)\\.png" . + ("\\(images/icons/\\)emacs_\\([0-9][0-9]\\)\\.png" "\\1hicolor/\\2x\\2/apps/emacs.png") + ;; Moved from leim/ to lisp/leim/. + ("\\`quail/[-a-z0-9]+\\.el\\'" "leim/\\&") + ("\\`ja-dic/ja-dic\\.el\\'" "leim/\\&") + ("\\`vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el\\'" "vc/vc-\\1.el") + ("\\`vc-\\(annotate\\|arch\\|bzr\\|cvs\\|dav\\|dir\\|dispatcher\\|\ +git\\|hg\\|hooks\\|mtn\\|rcs\\|sccs\\|svn\\)\\.el\\'" "vc/\\&") + ("\\`ediff-\\(diff\\|help\\|hook\\|init\\|merg\\|mult\\|ptch\\|util\\|\ +vers\\|wind\\)\\.el\\'" "vc/\\&") + ("\\`pcvs-\\(defs\\|info\\|parse\\|util\\)\\.el\\'" "vc/\\&") + ("\\`\\(add-log\\|compare-w\\|cvs-status\\|diff-mode\\|diff\\|\ +ediff\\|emerge\\|log-edit\\|log-view\\|pcvs\\|smerge-mode\\|vc\\)\\.el\\'" + "vc/\\&") + ("\\`\\(emacs-lisp/\\)?helpers\\.el\\'" "emacs-lisp/subr-x.el") + ;; I assume this is (essentially) what happened, org/ChangeLog is vague. + ("\\`org-\\(ascii\\|beamer\\|html\\|icalendar\\|jsinfo\\|latex\ +\\|odt\\|publish\\)\\.el\\'" "ox-\\1.el") + ;; From test/ to test/automated/. + ("comint-testsuite.el" "automated/\\&") + ("\\`\\(bytecomp\\|font-parse\\|icalendar\\|occur\\|newsticker\\)\ +-testsuite\\.el" "automated/\\1-tests.el") + ;; NB lax rules should come last. + ("^m/m-\\(.*\\.h\\)$" "m/\\1" t) + ("^m-\\(.*\\.h\\)$" "\\1" t) + ("^s/s-\\(.*\\.h\\)$" "s/\\1" t) + ("^s-\\(.*\\.h\\)$" "\\1" t) + ("\\.\\(el\\|[ch]\\|x[pb]m\\|pbm\\)\\'" t t) ) - "List regexps and rewriting rules for renamed files. -Elements are (REGEXP . REPLACE). If REPLACE is a string, the file + "List of regexps and rewriting rules for renamed files. +Elements are (REGEXP REPLACE [LAX]). If REPLACE is a string, the file name matching REGEXP is replaced by REPLACE using `replace-string'. -Otherwise, the file name is accepted as is.") +Otherwise, the file name is accepted as is. +Elements with LAX non-nil are only used in `authors-lax-changelogs'.") + +;; It's really not worth trying to make these old logs fully valid. +;; All the obvious real errors are gone. +;; The main issue is _lots_ of moving around of files. +;; Eg the progmodes/ (etc) directories did not exist before 1997. +;; Also, lib-src/ did not exist, the files were in etc/. +;; And various other things. +;; Maybe this should just be any ChangeLog with a . extension, +;; assuming we always fix logs fully before rotating them? +(defconst authors-lax-changelogs + '("erc/ChangeLog\\.0[1-8]\\'" + "gnus/ChangeLog\\.[1-2]\\'" + "lisp/ChangeLog\\.\\([1-9]\\|1[0-5]\\)\\'" + "mh-e/ChangeLog\\.1\\'" + "src/ChangeLog\\.\\([1-9]\\|1[0-2]\\)\\'") + "List of regexps matching ChangeLogs that we do not print errors from. +These are older ChangeLogs that have various issues. +Additionally, for these logs we apply the `lax' elements of +`authors-renamed-files-regexps'.") + (defvar authors-checked-files-alist) (defvar authors-invalid-file-names) +;; This has become rather yucky. :( (defun authors-disambiguate-file-name (fullname) "Convert FULLNAME to an unambiguous relative-name." (let ((relname (file-name-nondirectory fullname)) - parent) - (if (member relname authors-ambiguous-files) - ;; In case of ambiguity, just prepend the parent directory. - ;; FIXME obviously this is not a perfect solution. - (if (string-equal "lisp" - (setq parent (file-name-nondirectory - (directory-file-name - (file-name-directory fullname))))) + dir parent) + (if (and (member relname authors-ambiguous-files) + ;; Try to identify the top-level directory. + ;; FIXME should really use ROOT from M-x authors. + (not (and (file-directory-p + (expand-file-name + "lib-src" + (setq dir (file-name-directory fullname)))) + (file-directory-p (expand-file-name "etc" dir))))) + ;; I think it looks weird to see eg "lisp/simple.el". + ;; But for eg Makefile.in, we do want to say "lisp/Makefile.in". + (if (and (string-equal "lisp" + (setq parent (file-name-nondirectory + (directory-file-name dir)))) + ;; TODO better to simply have hard-coded list? + ;; Only really Makefile.in where this applies. + (not (file-exists-p + (expand-file-name (concat "../" relname) dir)))) relname - (format "%s/%s" parent relname)) + ;; In case of ambiguity, just prepend the parent directory. + ;; FIXME obviously this is not a perfect solution. + (format "%s/%s" (file-name-nondirectory (directory-file-name dir)) + relname)) relname))) +(defun authors-lax-changelog-p (file) + "Return non-nil if FILE matches `authors-lax-changelogs'." + (let ((list authors-lax-changelogs) + found) + (while list + (setq list (if (setq found (string-match-p (car list) file)) + nil + (cdr list)))) + found)) + (defun authors-canonical-file-name (file log-file pos author) "Return canonical file name for FILE found in LOG-FILE. Checks whether FILE is a valid (existing) file name, has been renamed, @@ -762,35 +989,39 @@ ;; same as that from top-level/ChangeLog. (let* ((fullname (expand-file-name file (file-name-directory log-file))) (entry (assoc fullname authors-checked-files-alist)) - relname - valid) + laxlog relname valid) (if entry (cdr entry) (setq relname (file-name-nondirectory file)) - (if (or (member relname authors-valid-file-names) + (if (or (member file authors-valid-file-names) + (member relname authors-valid-file-names) (file-exists-p file) - (file-exists-p relname) - (file-exists-p (concat "etc/" relname))) + (file-exists-p relname) ; FIXME? appropriate? + ) (setq valid (authors-disambiguate-file-name fullname)) - (setq valid (assoc file authors-renamed-files-alist)) - (if valid + (if (setq valid (assoc file authors-renamed-files-alist)) (setq valid (cdr valid)) - (let ((rules authors-renamed-files-regexps)) + (setq laxlog (authors-lax-changelog-p log-file)) + (let ((rules authors-renamed-files-regexps) + rule) (while rules - (if (string-match (car (car rules)) file) - (setq valid (if (stringp (cdr (car rules))) + (setq rule (car rules)) + (if (and (or laxlog (not (nth 2 rule))) + (string-match (car rule) file)) + (setq valid (if (stringp (nth 1 rule)) (file-name-nondirectory - (replace-match (cdr (car rules)) t nil file)) + (replace-match (nth 1 rule) t nil file)) relname) - rules nil)) - (setq rules (cdr rules)))))) + rules nil) + (setq rules (cdr rules))))))) (setq authors-checked-files-alist (cons (cons fullname valid) authors-checked-files-alist)) (unless (or valid (member file authors-ignored-files) (authors-obsolete-file-p file) (string-match "[*]" file) - (string-match "^[0-9.]+$" file)) + (string-match "^[0-9.]+$" file) + laxlog) (setq authors-invalid-file-names (cons (format "%s:%d: unrecognized `%s' for %s" log-file ------------------------------------------------------------ revno: 116046 committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 20:54:23 -0500 message: ChangeLog fixes diff: === modified file 'leim/ChangeLog' --- leim/ChangeLog 2014-01-14 08:13:13 +0000 +++ leim/ChangeLog 2014-01-17 01:54:23 +0000 @@ -200,7 +200,7 @@ 2012-06-12 Nguyen Thai Ngoc Duy - * quail/vnvi.el: New file (Bug#4747). + * quail/vnvni.el: New file (Bug#4747). 2012-05-22 Glenn Morris === modified file 'lisp/ChangeLog.1' --- lisp/ChangeLog.1 2014-01-16 08:34:43 +0000 +++ lisp/ChangeLog.1 2014-01-17 01:54:23 +0000 @@ -777,7 +777,7 @@ 1985-12-14 Richard M. Stallman (rms@prep) - * various: + * Various: Change uses of copy-sequence on keymaps to copy-alist. Use run-hooks for all hooks. === modified file 'lisp/ChangeLog.2' --- lisp/ChangeLog.2 2014-01-01 07:43:34 +0000 +++ lisp/ChangeLog.2 2014-01-17 01:54:23 +0000 @@ -2624,7 +2624,7 @@ 1986-11-04 Richard M. Stallman (rms@prep) - * various files (dired-mode, Edit-options-mode, rmail-mode) + * Various files (dired-mode, Edit-options-mode, rmail-mode) (rmail-summary-mode, rmail-edit-mode, Buffer-menu-mode): Give these symbols `special' as a `mode-class' property. === modified file 'lisp/ChangeLog.6' --- lisp/ChangeLog.6 2014-01-01 07:43:34 +0000 +++ lisp/ChangeLog.6 2014-01-17 01:54:23 +0000 @@ -3471,7 +3471,7 @@ 1996-01-14 Erik Naggum - * all files: Update FSF's address in, and unify formatting of, + * All files: Update FSF's address in, and unify formatting of, comment preambles. 1996-01-13 Erik Naggum === modified file 'lisp/ChangeLog.9' --- lisp/ChangeLog.9 2014-01-16 08:34:43 +0000 +++ lisp/ChangeLog.9 2014-01-17 01:54:23 +0000 @@ -12434,8 +12434,8 @@ (vc-cvs-merge-news): Set workfile version to nil if not known. (vc-cvs-latest-on-branch-p): Recommented. Candidate for removal. - * vc-*.el (vc-*-checkout): Switch off coding systems for checkout - via stdout. (Merge from main line.) + * vc-cvs.el, vc-rcs.el, vc-sccs.el (vc-*-checkout): Switch off + coding systems for checkout via stdout. (Merge from main line.) 2000-09-04 Stefan Monnier @@ -12695,21 +12695,22 @@ (vc-backend): Reintroduce the test for `file = nil' now that I know why it was there (and added a comment to better remember). - * vc-sccs-hooks.el: Merge into vc-sccs.el * vc-sccs.el: Merge in - code from vc-sccs-hooks.el. + * vc-sccs-hooks.el: Merge into vc-sccs.el + * vc-sccs.el: Merge in code from vc-sccs-hooks.el. (vc-sccs-release, vc-sccs-system-release): Remove. Don't require 'vc anymore. (vc-sccs-responsible-p): Use expand-file-name instead of concat and file-directory-p instead of file-exists-p. (vc-sccs-check-headers): Simplify the regexp. - * vc-rcs-hooks.el: Merge into vc-rcs.el * vc-rcs.el: Merge in code - from vc-rcs-hooks.el. Don't require 'vc anymore. + * vc-rcs-hooks.el: Merge into vc-rcs.el + * vc-rcs.el: Merge in code from vc-rcs-hooks.el. + Don't require 'vc anymore. (vc-rcs-responsible-p): Use expand-file-name instead of concat and file-directory-p instead of file-exists-p. - * vc-cvs-hooks.el: Merge into vc-cvs.el * vc-cvs.el: Merge in code - from vc-cvs-hooks.el. + * vc-cvs-hooks.el: Merge into vc-cvs.el + * vc-cvs.el: Merge in code from vc-cvs-hooks.el. (proto vc-cvs-registered): Require 'vc-cvs instead of 'vc-cvs-hooks. Don't require 'vc anymore. (vc-cvs-responsible-p): Use expand-file-name instead of concat and === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2014-01-16 08:34:43 +0000 +++ lisp/gnus/ChangeLog.2 2014-01-17 01:54:23 +0000 @@ -9597,7 +9597,7 @@ 2002-02-20 Katsumi Yamaoka - * many files: Remove trailing whitespaces, replace spc+tab with + * Many files: Remove trailing whitespaces, replace spc+tab with tab, replace leading whitespaces with tabs. 2002-02-19 Paul Jarc @@ -12532,7 +12532,7 @@ 2001-11-06 10:00:00 ShengHuo ZHU - * many files: Fix copyright lines. + * Many files: Fix copyright lines. 2001-11-05 07:00:00 ShengHuo ZHU === modified file 'src/ChangeLog.1' --- src/ChangeLog.1 2014-01-16 08:34:43 +0000 +++ src/ChangeLog.1 2014-01-17 01:54:23 +0000 @@ -2279,7 +2279,7 @@ Postpone fixup of free_at_end_vpos until unchanged_at_bottom is set up. - * everywhere: + * Everywhere: Remove many variables not really used. * process.c (count_active_processes): === modified file 'src/ChangeLog.2' --- src/ChangeLog.2 2014-01-15 03:06:07 +0000 +++ src/ChangeLog.2 2014-01-17 01:54:23 +0000 @@ -4131,7 +4131,7 @@ and DEFVAR_PER_BUFFER. They expand into calls to defvar_lisp, etc. - * all .c files: + * All .c files: All Def...Var renamed to DEFVAR... in syms_of_.... * doc.c (FSnarf_documentation): Understand new DOC format === modified file 'src/ChangeLog.6' --- src/ChangeLog.6 2014-01-01 07:43:34 +0000 +++ src/ChangeLog.6 2014-01-17 01:54:23 +0000 @@ -5354,6 +5354,10 @@ See ChangeLog.5 for earlier changes. +;; Local Variables: +;; coding: utf-8 +;; End: + Copyright (C) 1995-1996, 2001-2014 Free Software Foundation, Inc. This file is part of GNU Emacs. ------------------------------------------------------------ revno: 116045 fixes bug: http://debbugs.gnu.org/16442 author: Fabrice Niessen committer: Glenn Morris branch nick: trunk timestamp: Thu 2014-01-16 15:18:55 -0500 message: * etc/themes/leuven-theme.el: Updates. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-01-16 08:34:43 +0000 +++ etc/ChangeLog 2014-01-16 20:18:55 +0000 @@ -1,3 +1,7 @@ +2014-01-16 Fabrice Niessen + + * themes/leuven-theme.el: Updates. (Bug#16442) + 2014-01-12 David Engster * NEWS: Add missing renames to EIEIO section. Also, no functions === modified file 'etc/themes/leuven-theme.el' --- etc/themes/leuven-theme.el 2014-01-01 07:43:34 +0000 +++ etc/themes/leuven-theme.el 2014-01-16 20:18:55 +0000 @@ -4,7 +4,7 @@ ;; Author: Fabrice Niessen <(concat "fniessen" at-sign "pirilampo.org")> ;; URL: https://github.com/fniessen/emacs-leuven-theme -;; Version: 20130918.1010 +;; Version: 20140113.1205 ;; Keywords: color theme ;; This file is part of GNU Emacs. @@ -46,14 +46,14 @@ (cancel '(:slant italic :strike-through t :foreground "gray55")) (clock-line '(:box (:line-width 1 :color "#335EA8") :foreground "black" :background "#EEC900")) (code-block '(:foreground "#000088" :background "#FFFFE0")) - (code-inline '(:box (:line-width 1 :color "#DDDDDD") :foreground "#000088" :background "#FFFFE0")) + (code-inline '(:foreground "#007300" :background "#EBF5EB")) (column '(:height 1.0 :weight normal :slant normal :underline nil :strike-through nil :foreground "#E6AD4F" :background "#FFF2DE")) (diff-added '(:foreground "#008000" :background "#DDFFDD")) (diff-hunk-header '(:foreground "#990099" :background "#FFEEFF")) (diff-none '(:foreground "gray33")) (diff-removed '(:foreground "#A60000" :background "#FFDDDD")) (directory '(:weight bold :foreground "blue" :background "#FFFFD2")) - (highlight-line '(:background "#FEFCAE")) ;; #F5F5F5 or #CCDEED + (highlight-line '(:background "#FEFCAE")) ; #F5F5F5 or #CCDEED (link '(:underline t :foreground "#006DAF")) (mail-header-name '(:weight bold :foreground "black")) (marked-line '(:weight bold :foreground "white" :background "red")) @@ -66,9 +66,9 @@ (ol6 '(:height 1.0 :weight bold :slant italic :foreground "#0077CC")) (ol7 '(:height 1.0 :weight bold :slant italic :foreground "#2EAE2C")) (ol8 '(:height 1.0 :weight bold :slant italic :foreground "#FD8008")) - (region '(:background "#ADD6FF")) ;; #CCCCCC + (region '(:background "#ADD6FF")) ; #CCCCCC (shadow '(:foreground "#7F7F7F")) - (string '(:foreground "#FF4700")) ;; #D0372D or #23238E + (string '(:foreground "#036A07")) ; #D0372D or #23238E or #20590C (subject '(:weight bold :foreground "#CF5D60")) (symlink '(:foreground "deep sky blue")) (volatile-highlight '(:background "#FBE448")) @@ -81,22 +81,22 @@ `(bold-italic ((,class (:weight bold :slant italic :foreground "black")))) `(italic ((,class (:slant italic :foreground "#1A1A1A")))) `(underline ((,class (:underline t)))) - `(cursor ((,class (:background "#15FF00")))) + `(cursor ((,class (:background "#0FB300")))) ;; Highlighting faces - `(fringe ((,class (:foreground "#56B556" :background "#E2F9E2")))) + `(fringe ((,class (:foreground "#F7A421" :background "#F2F2F2")))) `(highlight ((,class ,volatile-highlight))) `(region ((,class ,region))) - `(secondary-selection ((,class ,match))) ;; used by Org-mode for highlighting matched entries and keywords + `(secondary-selection ((,class ,match))) ; used by Org-mode for highlighting matched entries and keywords `(isearch ((,class (:weight bold :foreground "#00AA00" :background "#99FF99")))) `(isearch-fail ((,class (:weight bold :foreground "black" :background "#FF9999")))) `(lazy-highlight ((,class (:weight bold :foreground "#990099" :background "#FF66FF")))) `(trailing-whitespace ((,class (:background "#F6EBFE")))) + `(whitespace-hspace ((,class (:foreground "#D2D2D2")))) + `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow")))) `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88")))) `(whitespace-tab ((,class (:foreground "lightgray" :background "beige")))) - `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow")))) `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1")))) - `(whitespace-hspace ((,class (:background "#CCE8F6")))) ;; Mode line faces `(mode-line ((,class (:box (:line-width 1 :color "#1A2F54") :foreground "#85CEEB" :background "#335EA8")))) @@ -110,31 +110,31 @@ `(minibuffer-noticeable-prompt ((,class (:weight bold :foreground "black" :background "gold")))) `(escape-glyph ((,class (:foreground "#008ED1")))) `(error ((,class (:foreground "red")))) - `(warning ((,class (:foreground "orange")))) + `(warning ((,class (:weight bold :foreground "orange")))) `(success ((,class (:foreground "green")))) ;; Font lock faces `(font-lock-builtin-face ((,class (:foreground "#006FE0")))) - `(font-lock-comment-delimiter-face ((,class (:foreground "#008200")))) ;; #696969 - `(font-lock-comment-face ((,class (:slant italic :foreground "#008200")))) ;; #696969 - `(font-lock-constant-face ((,class (:foreground "#6434A3")))) + `(font-lock-comment-delimiter-face ((,class (:foreground "#8D8D84")))) ; #696969 + `(font-lock-comment-face ((,class (:slant italic :foreground "#8D8D84")))) ; #696969 + `(font-lock-constant-face ((,class (:foreground "#D0372D")))) `(font-lock-doc-face ((,class (:foreground "#008000")))) `(font-lock-doc-string-face ((,class (:foreground "#008000")))) - `(font-lock-function-name-face ((,class (:foreground "#006699")))) - `(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ;; #3654DC + `(font-lock-function-name-face ((,class (:weight normal :foreground "#006699")))) + `(font-lock-keyword-face ((,class (:bold nil :foreground "#0000FF")))) ; #3654DC `(font-lock-preprocessor-face ((,class (:foreground "#808080")))) `(font-lock-regexp-grouping-backslash ((,class (:weight bold :inherit nil)))) `(font-lock-regexp-grouping-construct ((,class (:weight bold :inherit nil)))) `(font-lock-string-face ((,class ,string))) - `(font-lock-type-face ((,class (:foreground "#666666")))) - `(font-lock-variable-name-face ((,class (:foreground "#BA36A5")))) ;; #800080 + `(font-lock-type-face ((,class (:weight normal :foreground "#6434A3")))) + `(font-lock-variable-name-face ((,class (:weight normal :foreground "#BA36A5")))) ; #800080 `(font-lock-warning-face ((,class (:weight bold :foreground "red")))) ;; Button and link faces - `(link ((,class (:foreground "#8AC6F2" :underline t)))) - `(link-visited ((,class (:foreground "#E5786D" :underline t)))) + `(link ((,class (:underline t :foreground "#8AC6F2")))) + `(link-visited ((,class (:underline t :foreground "#E5786D")))) `(button ((,class (:underline t :foreground "#006DAF")))) - `(header-line ((,class (:weight bold :foreground "black" :background "#FFFF88" :underline "black" :overline "black")))) + `(header-line ((,class (:weight bold :underline "black" :overline "black" :foreground "black" :background "#FFFF88")))) ;; Gnus faces `(gnus-cite-attribution-face ((,class (:foreground "#5050B0")))) @@ -195,7 +195,7 @@ `(gnus-summary-normal-read ((,class (:foreground "#808080")))) `(gnus-summary-normal-ticked ((,class (:foreground "black" :background "#E7AEB0")))) `(gnus-summary-normal-unread ((,class (:foreground "black")))) - `(gnus-summary-selected ((,class (:foreground "black" :background "#FFD0D0" :underline t)))) + `(gnus-summary-selected ((,class (:underline t :foreground "black" :background "#FFD0D0")))) `(gnus-x-face ((,class (:foreground "black" :background "white")))) ;; Message faces @@ -219,7 +219,7 @@ `(diff-file2-hunk-header ((,class (:foreground "#2B7E2A" :background "#EAF2F5")))) `(diff-header ((,class (:foreground "#999999" :background "#EAF2F5")))) `(diff-hunk-header ((,class ,diff-hunk-header))) - `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ;; my foreground is NOT applied!? + `(diff-index ((,class (:foreground "#4183C4" :background "#EAF2F5")))) ; my foreground is NOT applied!? `(diff-indicator-added ((,class (:foreground "#008000" :background "#AAFFAA")))) `(diff-indicator-changed ((,class (:foreground "black" :background "#AAAAFF")))) `(diff-indicator-removed ((,class (:foreground "#A60000" :background "#FFAAAA")))) @@ -257,10 +257,11 @@ `(Info-title-2-face ((,class ,ol2))) `(Info-title-3-face ((,class ,ol3))) `(Info-title-4-face ((,class ,ol4))) + `(ace-jump-face-foreground ((,class (:foreground "black" :background "#FBE448")))) `(bbdb-company ((,class (:slant italic :foreground "steel blue")))) `(bbdb-field-name ((,class (:weight bold :foreground "steel blue")))) `(bbdb-field-value ((,class (:foreground "steel blue")))) - `(bbdb-name ((,class (:foreground "#FF6633" :underline t)))) + `(bbdb-name ((,class (:underline t :foreground "#FF6633")))) `(browse-kill-ring-separator-face ((,class (:weight bold :foreground "slate gray")))) `(calendar-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE")))) `(cfw:face-annotation ((,class (:foreground "green" :background "red")))) @@ -283,17 +284,17 @@ `(cfw:face-toolbar-button-on ((,class (:foreground "#5E5E5E" :background "#F6F6F6")))) `(change-log-date-face ((,class (:foreground "purple")))) `(change-log-file ((,class (:weight bold :foreground "#4183C4")))) - `(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ;; other nick names - `(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ;; messages with my nick cited + `(circe-highlight-all-nicks-face ((,class (:foreground "blue" :background "#F0F0F0")))) ; other nick names + `(circe-highlight-nick-face ((,class (:foreground "#009300" :background "#F0F0F0")))) ; messages with my nick cited `(circe-my-message-face ((,class (:foreground "#8B8B8B" :background "#F0F0F0")))) `(circe-originator-face ((,class (:foreground "blue")))) `(circe-prompt-face ((,class (:foreground "red")))) `(circe-server-face ((,class (:foreground "#99CAE5")))) - `(comint-highlight-input ((,class ,code-block))) - `(comint-highlight-prompt ((,class (:foreground "#008ED1" :background "#EAEAFF")))) + `(comint-highlight-input ((,class (:weight bold :foreground "#0000FF")))) + `(comint-highlight-prompt ((,class (:weight bold :foreground "black" :background "gold")))) `(compare-windows ((,class (:background "#FFFF00")))) `(compilation-error ((,class (:weight bold :foreground "red")))) - `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ;; used for grep + `(compilation-info ((,class (:weight bold :foreground "#2A489E")))) ; used for grep `(compilation-line-number ((,class (:weight bold :foreground "#A535AE")))) `(compilation-warning ((,class (:weight bold :foreground "orange")))) `(css-property ((,class (:foreground "#00AA00")))) @@ -301,7 +302,7 @@ `(custom-button ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "lightgrey")))) `(custom-button-mouse ((,class (:box (:line-width 2 :style released-button) :foreground "black" :background "grey90")))) `(custom-button-pressed ((,class (:box (:line-width 2 :style pressed-button) :foreground "black" :background "light grey")))) - `(custom-button-pressed-unraised ((,class (:foreground "magenta4" :underline t)))) + `(custom-button-pressed-unraised ((,class (:underline t :foreground "magenta4")))) `(custom-button-unraised ((,class (:underline t)))) `(custom-changed ((,class (:foreground "white" :background "blue")))) `(custom-comment ((,class (:background "gray85")))) @@ -311,7 +312,7 @@ `(custom-group-tag ((,class (:height 1.2 :weight bold :foreground "blue1")))) `(custom-group-tag-1 ((,class (:family "Sans Serif" :height 1.2 :weight bold :foreground "red1")))) `(custom-invalid ((,class (:foreground "yellow" :background "red")))) - `(custom-link ((,class (:foreground "blue1" :underline t)))) + `(custom-link ((,class (:underline t :foreground "blue1")))) `(custom-modified ((,class (:foreground "white" :background "blue")))) `(custom-rogue ((,class (:foreground "pink" :background "black")))) `(custom-saved ((,class (:underline t)))) @@ -375,8 +376,9 @@ `(font-latex-verbatim-face ((,class (:foreground "#000088" :background "#FFFFE0" :inherit nil)))) `(git-commit-summary-face ((,class (:foreground "#000000")))) `(git-commit-comment-face ((,class (:slant italic :foreground "#696969")))) - `(helm-action ((,class (:foreground "#335EA8")))) + `(helm-action ((,class (:foreground "black")))) `(helm-bookmarks-su-face ((,class (:foreground "red")))) + `(helm-buffer-process ((,class (:foreground "#008200")))) `(helm-candidate-number ((,class (:foreground "black" :background "#FFFF66")))) `(helm-dir-heading ((,class (:foreground "blue" :background "pink")))) `(helm-dir-priv ((,class (:foreground "dark red" :background "light grey")))) @@ -388,20 +390,22 @@ `(helm-file-name ((,class (:foreground "blue")))) `(helm-gentoo-match-face ((,class (:foreground "red")))) `(helm-grep-running ((,class (:weight bold :foreground "white")))) + `(helm-grep-lineno ((,class ,shadow))) `(helm-isearch-match ((,class (:background "#CCFFCC")))) `(helm-match ((,class ,match))) + `(helm-moccur-buffer ((,class (:foreground "#0066CC")))) `(helm-selection ((,class ,highlight-line))) `(helm-selection-line ((,class ,volatile-highlight))) `(helm-source-header ((,class (:family "Sans Serif" :height 1.3 :weight bold :foreground "white" :background "#2F69BF")))) `(helm-visible-mark ((,class ,marked-line))) - `(helm-w3m-bookmarks-face ((,class (:foreground "cyan1" :underline t)))) + `(helm-w3m-bookmarks-face ((,class (:underline t :foreground "cyan1")))) `(highlight-symbol-face ((,class (:background "#FFFFA0")))) `(hl-line ((,class ,highlight-line))) `(hl-tags-face ((,class (:background "#FEFCAE")))) `(holiday-face ((,class (:foreground "#777777" :background "#E4EBFE")))) `(html-helper-bold-face ((,class (:weight bold :foreground "black")))) `(html-helper-italic-face ((,class (:slant italic :foreground "black")))) - `(html-helper-underline-face ((,class (:foreground "black" :underline t)))) + `(html-helper-underline-face ((,class (:underline t :foreground "black")))) `(html-tag-face ((,class (:foreground "blue")))) `(ilog-non-change-face ((,class (:height 2.0 :foreground "#6434A3")))) `(ilog-change-face ((,class (:height 2.0 :foreground "#008200")))) @@ -409,21 +413,21 @@ `(ilog-load-face ((,class (:foreground "#BA36A5")))) `(ilog-message-face ((,class (:foreground "#808080")))) `(info-file ((,class (:family "Sans Serif" :height 1.8 :weight bold :box (:line-width 1 :color "#0000CC") :foreground "cornflower blue" :background "LightSteelBlue1")))) - `(info-header-node ((,class (:foreground "orange" :underline t)))) ;; nodes in header - `(info-header-xref ((,class (:foreground "dodger blue" :underline t)))) ;; cross references in header - `(info-menu-header ((,class (:family "Sans Serif" :height 1.6 :weight bold :foreground "#00CC00" :underline t)))) ;; menu titles (headers) -- major topics - `(info-menu-star ((,class (:foreground "black")))) ;; every 3rd menu item - `(info-node ((,class (:foreground "blue" :underline t)))) ;; node names + `(info-header-node ((,class (:underline t :foreground "orange")))) ; nodes in header + `(info-header-xref ((,class (:underline t :foreground "dodger blue")))) ; cross references in header + `(info-menu-header ((,class ,ol2))) ; menu titles (headers) -- major topics + `(info-menu-star ((,class (:foreground "black")))) ; every 3rd menu item + `(info-node ((,class (:underline t :foreground "blue")))) ; node names `(info-quoted-name ((,class ,code-inline))) `(info-string ((,class ,string))) `(info-title-1 ((,class ,ol1))) - `(info-xref ((,class (:weight bold :foreground "blue" :underline t)))) ;; unvisited cross-references - `(info-xref-visited ((,class (:weight bold :foreground "magenta4")))) ;; previously visited cross-references + `(info-xref ((,class (:underline t :foreground "#006DAF")))) ; unvisited cross-references + `(info-xref-visited ((,class (:underline t :foreground "magenta4")))) ; previously visited cross-references `(light-symbol-face ((,class (:background "#FFFFA0")))) `(linum ((,class (:foreground "#AFAFAF" :background "white")))) `(log-view-file ((,class (:foreground "#0000CC" :background "#EAF2F5")))) `(lui-button-face ((,class ,link))) - `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ;; my nickname + `(lui-highlight-face ((,class (:box '(:line-width 1 :color "#CC0000") :foreground "#CC0000" :background "#FFFF88")))) ; my nickname `(lui-time-stamp-face ((,class (:foreground "purple")))) `(magit-branch ((,class ,vc-branch))) `(magit-diff-add ((,class ,diff-added))) @@ -460,7 +464,7 @@ `(org-agenda-calendar-sexp ((,class (:foreground "#777777" :background "#E4EBFE")))) `(org-agenda-clocking ((,class ,clock-line))) `(org-agenda-column-dateline ((,class ,column))) - `(org-agenda-current-time ((,class (:foreground "#1662AF" :underline t)))) + `(org-agenda-current-time ((,class (:underline t :foreground "#1662AF")))) `(org-agenda-date ((,class (:height 1.6 :weight bold :foreground "#1662AF")))) `(org-agenda-date-today ((,class (:height 1.6 :weight bold :foreground "#4F4A3D" :background "#FFFABE")))) `(org-agenda-date-weekend ((,class (:height 1.6 :weight bold :foreground "#4E4E4E")))) @@ -470,19 +474,20 @@ `(org-agenda-filter-category ((,class (:weight bold :foreground "orange")))) `(org-agenda-filter-tags ((,class (:weight bold :foreground "orange")))) `(org-agenda-restriction-lock ((,class (:background "#E77D63")))) - `(org-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC")))) + ;; `(org-agenda-structure ((,class (:height 1.6 :weight bold :box (:line-width 1 :color "#999999") :foreground "#666666" :background "#CCCCCC")))) + `(org-agenda-structure ((,class (:height 1.6 :bold nil :foreground "#999999")))) `(org-archived ((,class (:foreground "gray70")))) `(org-beamer-tag ((,class (:box (:line-width 1 :color "#FABC18") :foreground "#2C2C2C" :background "#FFF8D0")))) `(org-block ((,class ,code-block))) `(org-block-background ((,class (:background "#FFFFE0")))) - `(org-block-begin-line ((,class (:foreground "#555555" :background "#E2E1D5" :underline "#A7A6AA")))) + `(org-block-begin-line ((,class (:underline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) `(org-block-end-line ((,class (:overline "#A7A6AA" :foreground "#555555" :background "#E2E1D5")))) `(org-checkbox ((,class (:weight bold :box (:line-width 1 :style pressed-button) :foreground "white" :background "#777777")))) `(org-clock-overlay ((,class (:foreground "white" :background "SkyBlue4")))) - `(org-code ((,class (:foreground "#007300" :background "#EBF5EB")))) + `(org-code ((,class ,code-inline))) `(org-column ((,class ,column))) `(org-column-title ((,class ,column))) - `(org-date ((,class (:foreground "#00459E" :underline t)))) + `(org-date ((,class (:underline t :foreground "#00459E")))) `(org-default ((,class (:foreground "#333333")))) `(org-dim ((,class (:foreground "#AAAAAA")))) `(org-document-info ((,class (:foreground "#484848")))) @@ -490,9 +495,9 @@ `(org-document-title ((,class (:family "Sans Serif" :height 1.8 :weight bold :foreground "black")))) `(org-done ((,class (:weight bold :box (:line-width 1 :color "#BBBBBB") :foreground "#BBBBBB" :background "#F0F0F0")))) `(org-drawer ((,class (:foreground "light sky blue")))) - `(org-ellipsis ((,class (:box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0" :underline nil)))) ;; #FFEE62 + `(org-ellipsis ((,class (:underline nil :box (:line-width 1 :color "#999999") :foreground "#999999" :background "#FFF8C0")))) ; #FFEE62 `(org-example ((,class (:foreground "blue" :background "#EAFFEA")))) - `(org-footnote ((,class (:foreground "#008ED1" :underline t)))) + `(org-footnote ((,class (:underline t :foreground "#008ED1")))) `(org-formula ((,class (:foreground "chocolate1")))) `(org-headline-done ((,class (:height 1.0 :weight normal :foreground "#999999")))) `(org-hide ((,class (:foreground "#E2E2E2")))) @@ -516,11 +521,11 @@ `(org-quote ((,class (:slant italic :foreground "dim gray" :background "#FFFFE0")))) `(org-scheduled ((,class (:foreground "#333333")))) `(org-scheduled-previously ((,class (:weight bold :foreground "#373737")))) - `(org-scheduled-today ((,class (:weight bold :foreground "#4F4A3D" :background "#FFFABE")))) + `(org-scheduled-today ((,class (:foreground "#4F4A3D" :background "#FFFABE")))) `(org-sexp-date ((,class (:foreground "#3774CC")))) `(org-special-keyword ((,class (:weight bold :foreground "#00BB00" :background "#EAFFEA")))) `(org-table ((,class (:foreground "dark green" :background "#EAFFEA")))) - `(org-tag ((,class (:weight normal :slant italic :foreground "#80A0BC")))) + `(org-tag ((,class (:weight normal :slant italic :foreground "#9A9FA4" :background "#F3F3F3")))) `(org-target ((,class ,link))) `(org-time-grid ((,class (:foreground "#CFCFCF")))) `(org-todo ((,class (:weight bold :box (:line-width 1 :color "#D8ABA7") :foreground "#D8ABA7" :background "#FFE6E4")))) @@ -554,11 +559,13 @@ `(shell-prompt-face ((,class (:weight bold :foreground "yellow")))) `(show-paren-match ((,class (:foreground "#E2464C" :background "#FFFF00")))) `(show-paren-mismatch ((,class (:weight bold :foreground "white" :background "#FF3F3F")))) + `(sml-modeline-end-face ((,class (:background "#6BADF6")))) ; #335EA8 + `(sml-modeline-vis-face ((,class (:background "#1979CA")))) `(speedbar-button-face ((,class (:foreground "green4")))) `(speedbar-directory-face ((,class (:foreground "blue4")))) `(speedbar-file-face ((,class (:foreground "cyan4")))) `(speedbar-highlight-face ((,class ,volatile-highlight))) - `(speedbar-selected-face ((,class (:foreground "red" :underline t)))) + `(speedbar-selected-face ((,class (:underline t :foreground "red")))) `(speedbar-tag-face ((,class (:foreground "brown")))) `(svn-status-directory-face ((,class ,directory))) `(svn-status-filename-face ((,class (:weight bold :foreground "#4183C4")))) @@ -595,30 +602,25 @@ `(w3m-arrived-anchor ((,class (:foreground "purple1")))) `(w3m-bitmap-image-face ((,class (:foreground "gray4" :background "green")))) `(w3m-bold ((,class (:weight bold :foreground "black")))) - `(w3m-current-anchor ((,class (:weight bold :foreground "blue" :underline t)))) - `(w3m-form ((,class (:foreground "tan1" :underline t)))) - `(w3m-form-button-face ((,class (:weight bold :foreground "gray4" :background "light grey" :underline t)))) - `(w3m-form-button-mouse-face ((,class (:foreground "light grey" :background "#2B7E2A" :underline t)))) - `(w3m-form-button-pressed-face ((,class (:weight bold :foreground "gray4" :background "light grey" :underline t)))) + `(w3m-current-anchor ((,class (:weight bold :underline t :foreground "blue")))) + `(w3m-form ((,class (:underline t :foreground "tan1")))) + `(w3m-form-button-face ((,class (:weight bold :underline t :foreground "gray4" :background "light grey")))) + `(w3m-form-button-mouse-face ((,class (:underline t :foreground "light grey" :background "#2B7E2A")))) + `(w3m-form-button-pressed-face ((,class (:weight bold :underline t :foreground "gray4" :background "light grey")))) `(w3m-header-line-location-content-face ((,class (:foreground "#7F7F7F":background "#F7F7F7")))) `(w3m-header-line-location-title-face ((,class (:foreground "#2C55B1" :background "#F7F7F7")))) `(w3m-history-current-url-face ((,class (:foreground "lemon chiffon")))) `(w3m-image-face ((,class (:weight bold :foreground "DarkSeaGreen2")))) - `(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ;; mouseless browsing + `(w3m-link-numbering ((,class (:foreground "#B4C7EB")))) ; mouseless browsing `(w3m-strike-through-face ((,class (:strike-through t)))) `(w3m-underline-face ((,class (:underline t)))) `(which-func ((,class (:weight bold :foreground "white")))) - `(whitespace-hspace ((,class (:background "#CCE8F6")))) - `(whitespace-indentation ((,class (:foreground "firebrick" :background "yellow")))) - `(whitespace-line ((,class (:foreground "#CC0000" :background "#FFFF88")))) - `(whitespace-tab ((,class (:foreground "lightgray" :background "beige")))) - `(whitespace-trailing ((,class (:weight bold :foreground "yellow" :background "red1")))) - `(widget-button-face ((,class ,link))) - `(widget-button-pressed-face ((,class (:foreground "red")))) - `(widget-documentation-face ((,class (:foreground "green4")))) - `(widget-field-face ((,class (:background "gray85")))) - `(widget-inactive-face ((,class (:foreground "dim gray")))) - `(widget-single-line-field-face ((,class (:background "gray85")))) + `(widget-button ((,class ,link))) + `(widget-button-pressed ((,class (:foreground "red")))) + `(widget-documentation ((,class (:foreground "green4")))) + `(widget-field ((,class (:background "gray85")))) + `(widget-inactive ((,class (:foreground "dim gray")))) + `(widget-single-line-field ((,class (:background "gray85")))) `(yas/field-debug-face ((,class (:background "ivory2")))) `(yas/field-highlight-face ((,class (:background "DarkSeaGreen1")))) )) ------------------------------------------------------------ revno: 116044 committer: Dmitry Gutov branch nick: trunk timestamp: Thu 2014-01-16 18:44:17 +0200 message: Finally make package-desc--keywords work * lisp/emacs-lisp/package.el (package-desc--keywords): Use `nth' instead of `cdr'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-16 12:23:14 +0000 +++ lisp/ChangeLog 2014-01-16 16:44:17 +0000 @@ -1,7 +1,8 @@ 2014-01-16 Dmitry Gutov * emacs-lisp/package.el (package-desc--keywords): Use `cdr' with - `assoc'. Make private. Update all callers. + `assoc'. Use `nth' instead of `cdr'. Make private. Update all + callers. 2014-01-16 Stefan Monnier === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2014-01-16 12:23:14 +0000 +++ lisp/emacs-lisp/package.el 2014-01-16 16:44:17 +0000 @@ -390,7 +390,7 @@ (defun package-desc--keywords (pkg-desc) (let ((keywords (cdr (assoc :keywords (package-desc-extras pkg-desc))))) (if (eq (car-safe keywords) 'quote) - (cdr keywords) + (nth 1 keywords) keywords))) ;; Package descriptor format used in finder-inf.el and package--builtins. ------------------------------------------------------------ revno: 116043 committer: Eric S. Raymond branch nick: trunk timestamp: Thu 2014-01-16 10:05:18 -0500 message: Minor correction to admin/notes/bzr: *fourth* VCS, not third. RCS -> CVS -> Bzr -> Git. And (as Stefan Monnier reports) "GNU Arch was semi-officially used for a while between CVS and Bzr, tho not for the main branch." diff: === modified file 'admin/notes/commits' --- admin/notes/commits 2014-01-16 05:50:26 +0000 +++ admin/notes/commits 2014-01-16 15:05:18 +0000 @@ -45,10 +45,10 @@ for modern source-control systems with a global log, it's better to have something like "Regenerate configure". -(4) (Added in 2014) In commit comments, and ChangLog files, it is best +(4) (Added in 2014) In commit comments, and ChangeLog files, it is best to use ways of identifying revisions that are not dependent on a particular version control system. (At time of writing Emacs is - about to move to its third VCS and another move in the future is + about to move to its fourth VCS and another move in the future is not impossible.) An excellent way to identify commits is by quoting their summary line. Another is with an action stamp - an RFC3339 date followed by ! followed by the committer's email - for ------------------------------------------------------------ revno: 116042 committer: Dmitry Gutov branch nick: trunk timestamp: Thu 2014-01-16 14:23:14 +0200 message: * lisp/emacs-lisp/package.el (package-desc--keywords): Use `cdr' with `assoc'. Make private. Update all callers. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-01-16 00:26:45 +0000 +++ lisp/ChangeLog 2014-01-16 12:23:14 +0000 @@ -1,3 +1,8 @@ +2014-01-16 Dmitry Gutov + + * emacs-lisp/package.el (package-desc--keywords): Use `cdr' with + `assoc'. Make private. Update all callers. + 2014-01-16 Stefan Monnier * follow.el (follow-adjust-window): Remove `dest' argument (bug#16426). === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2014-01-15 04:58:06 +0000 +++ lisp/emacs-lisp/package.el 2014-01-16 12:23:14 +0000 @@ -387,8 +387,8 @@ (`tar ".tar") (kind (error "Unknown package kind: %s" kind)))) -(defun package-desc-keywords (pkg-desc) - (let ((keywords (assoc :keywords (package-desc-extras pkg-desc)))) +(defun package-desc--keywords (pkg-desc) + (let ((keywords (cdr (assoc :keywords (package-desc-extras pkg-desc))))) (if (eq (car-safe keywords) 'quote) (cdr keywords) keywords))) @@ -1387,7 +1387,7 @@ (archive (if desc (package-desc-archive desc))) (extras (and desc (package-desc-extras desc))) (homepage (cdr (assoc :url extras))) - (keywords (if desc (package-desc-keywords desc))) + (keywords (if desc (package-desc--keywords desc))) (built-in (eq pkg-dir 'builtin)) (installable (and archive (not built-in))) (status (if desc (package-desc-status desc) "orphan")) @@ -1738,7 +1738,7 @@ (let (keywords) (package--mapc (lambda (desc) (let* ((extras (and desc (package-desc-extras desc))) - (desc-keywords (and desc (package-desc-keywords desc)))) + (desc-keywords (and desc (package-desc--keywords desc)))) (setq keywords (append keywords desc-keywords))))) keywords)) @@ -1780,7 +1780,7 @@ When none are given, the package matches." (if keywords (let* ((extras (and desc (package-desc-extras desc))) - (desc-keywords (and desc (package-desc-keywords desc))) + (desc-keywords (and desc (package-desc--keywords desc))) found) (dolist (k keywords) (when (and (not found)