diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-24 22:41:40 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-02-24 22:41:40 -0800 |
commit | a89654f8f34114db543cb91363e8fded6d73e986 (patch) | |
tree | 5ac508597ef2aa460308b4b26c244779e48cdb40 /lisp/emacs-lisp | |
parent | 6e6c82a4e687708d5a7a3887f92db45bd74da276 (diff) | |
parent | 67b0de11479247cb8bd8491e10e0b464046f18be (diff) | |
download | emacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.gz emacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.bz2 emacs-a89654f8f34114db543cb91363e8fded6d73e986.zip |
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r-- | lisp/emacs-lisp/authors.el | 54 | ||||
-rw-r--r-- | lisp/emacs-lisp/cl-indent.el | 3 | ||||
-rw-r--r-- | lisp/emacs-lisp/easy-mmode.el | 7 | ||||
-rw-r--r-- | lisp/emacs-lisp/lisp.el | 5 |
4 files changed, 60 insertions, 9 deletions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el index bf9f500b542..f12beed3271 100644 --- a/lisp/emacs-lisp/authors.el +++ b/lisp/emacs-lisp/authors.el @@ -1,6 +1,6 @@ ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: utf-8;-*- -;; Copyright (C) 2000-2012 Free Software Foundation, Inc. +;; Copyright (C) 2000-2012 Free Software Foundation, Inc. ;; Author: Gerd Moellmann <gerd@gnu.org> ;; Maintainer: Kim F. Storm <storm@cua.dk> @@ -41,23 +41,28 @@ files.") (defconst authors-aliases '( ("Aaron S. Hawley" "Aaron Hawley") + ("Alexandru Harsanyi" "Alex Harsanyi") ("Andrew Csillag" "Drew Csillag") ("Anna M. Bigatti" "Anna Bigatti") ("Barry A. Warsaw" "Barry A. Warsaw, Century Computing, Inc." "Barry A. Warsaw, ITB" "Barry Warsaw") + ("Bill Carpenter" "WJ Carpenter") ("Bill Mann" "William F. Mann") ("Bill Rozas" "Guillermo J. Rozas") ("Björn Torkelsson" "Bjorn Torkelsson") ("Brian Fox" "Brian J. Fox") + ("Brian Sniffen" "Brian T. Sniffen") ("Christoph Wedler" "Christoph.Wedler@sap.com") ("Daniel Pfeiffer" "<Daniel.Pfeiffer@Informatik.START.db.de>" "<Daniel.Pfeiffer@Informatik.START.dbp.de>") + ("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. Smith" "David Smith" "David M Smith") + ("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" @@ -76,6 +81,8 @@ files.") ("Gerd Möllmann" "Gerd Moellmann") ("Hallvard B. Furuseth" "Hallvard B Furuseth" "Hallvard Furuseth") ("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. @@ -92,6 +99,7 @@ files.") ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen") ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard") ("Johan Bockgård" "Johan Bockgard") + ("John J Foerch" "John Foerch") ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") ("Joseph Arceneaux" "Joe Arceneaux") @@ -109,10 +117,11 @@ files.") ("Kevin Greiner" "Kevin J. Greiner") ("Kim F. Storm" "Kim Storm") ("Kyle Jones" "Kyle E. Jones") + ("Lars Magne Ingebrigtsen" "Lars Ingebrigtsen") ("Marcus G. Daniels" "Marcus Daniels") ("Mark D. Baushke" "Mark D Baushke") ("Marko Kohtala" "Kohtala Marko") - ("Agustín Martín" "Agustin Martin") + ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo") ("Martin Lorentzon" "Martin Lorentzson") ("Matt Swift" "Matthew Swift") ("Maxime Edouard Robert Froumentin" "Max Froumentin") @@ -124,12 +133,14 @@ files.") ("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 Reilly" "(pmr@legacy.pajato.com)") ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik" "Pavel Janík" "Pavel@Janik.Cz") ("Pavel Kobiakov" "Pavel Kobyakov") ("Per Abrahamsen" "Per Abhiddenware") ("Per Starbäck" "Per Starback") + ("Peter J. Weisberg" "PJ Weisberg") ("Peter S. Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") ("Peter S. Galbraith" "Peter S Galbraith") @@ -144,16 +155,19 @@ files.") ("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") + ("T.V. Raman" "T\\. V\\. Raman") ("Taichi Kawabata" "KAWABATA,? Taichi") ("Takaaki Ota" "Tak Ota") ("Takahashi Naoto" "Naoto Takahashi") ("Teodor Zlatanov" "Ted Zlatanov") + ("Thomas Dye" "Tom Dye") ("Thomas Horsley" "Tom Horsley") ; FIXME ? ("Thomas Wurgler" "Tom Wurgler") ("Tomohiko Morioka" "MORIOKA Tomohiko") @@ -174,6 +188,7 @@ Each entry is of the form (REALNAME REGEXP...). If an author's name matches one of the REGEXPs, use REALNAME instead. If REALNAME is nil, ignore that author.") +;; FIXME seems it would be less fragile to check for O', Mc, etc. (defconst authors-fixed-case '("Bryan O'Sullivan" "Christian von Roques" @@ -182,6 +197,7 @@ If REALNAME is nil, ignore that author.") "David J. MacKenzie" "David McCabe" "David O'Toole" + "Devon Sean McCullough" "Dominique de Waleffe" "Edward O'Connor" "Exal de Jesus Garcia Carrillo" @@ -194,8 +210,11 @@ If REALNAME is nil, ignore that author.") "Nelson Jose dos Santos Ferreira" "Peter von der Ahe" "Peter O'Gorman" + "Piet van Oostrum" "Roland McGrath" - "Sean O'Rourke") + "Sean O'Halpin" + "Sean O'Rourke" + "Tijs van Bakel") "List of authors whose names cannot be simply capitalized.") (defvar authors-public-domain-files @@ -222,11 +241,12 @@ If REALNAME is nil, ignore that author.") ".*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" "preferences\\.\\(nib\\|gorm\\)" "vc-\\(rcs\\|cvs\\|sccs\\)-hooks\\.el$") "List of regexps matching obsolete files. -Changes to files matching one of the regexps in this list are not -listed.") +Changes to files matching one of the regexps in this list are not listed.") (defconst authors-ignored-files '("external-lisp" @@ -257,7 +277,12 @@ listed.") "*.el" ;; Autogen: "cus-load.el" "finder-inf.el" "ldefs-boot.el" + "compile" "config.guess" "config.sub" "depcomp" + ;; Only existed briefly, then renamed: + "images/icons/allout-widgets-dark-bg" + "images/icons/allout-widgets-light-bg" ;; Never had any meaningful changes logged, now deleted: + "unidata/bidimirror.awk" "unidata/biditype.awk" "split-man" "Xkeymap.txt" "ms-7bkermit" "ulimit.hack" "gnu-hp300" "refcard.bit" "ledit.l" "forms.README" "forms-d2.dat" "CXTERM-DIC/PY.tit" "CXTERM-DIC/ZIRANMA.tit" @@ -308,29 +333,47 @@ Changes to files in this list are not listed.") "complete.el" "cpp.el" "ctxt.el" + "custom.el" + "cyrillic.el" + "czech.el" "debug.el" "dired.el" "el.el" + "eshell.el" + "ethiopic.el" + "f90.el" "files.el" "find.el" "format.el" + "generic.el" + "georgian.el" + "greek.el" "grep.el" + "hebrew.el" "imenu.el" + "indian.el" + "japanese.el" "java.el" + "lao.el" "linux.el" "locate.el" "make.el" "mode.el" "python.el" + "rmailmm.el" "semantic.el" "shell.el" "simple.el" + "slovak.el" "sort.el" "speedbar.el" "srecode.el" "table.el" "texi.el" + "thai.el" + "tibetan.el" "util.el" + "vc-bzr.el" "wisent.el") "List of basenames occurring more than once in the source.") @@ -588,6 +631,7 @@ in the repository.") ("texi/url.txi" . "url.texi") ("edt-user.doc" . "edt.texi") ("DEV-NOTES" . "nextstep") + ("org/COPYRIGHT-AND-LICENSE" . "org/README") ;; Moved to different directories. ("ctags.1" . "ctags.1") ("etags.1" . "etags.1") diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el index 0a690af572c..01bdfbf4bf2 100644 --- a/lisp/emacs-lisp/cl-indent.el +++ b/lisp/emacs-lisp/cl-indent.el @@ -104,6 +104,7 @@ If non-nil, alignment is done with the first keyword \(defun foo (arg1 arg2 &rest rest &key key1 key2) #|...|#)" + :version "24.1" :type 'boolean :group 'lisp-indent) @@ -111,6 +112,7 @@ If non-nil, alignment is done with the first keyword "Indentation of lambda list keyword parameters. See `lisp-lambda-list-keyword-parameter-alignment' for more information." + :version "24.1" :type 'integer :group 'lisp-indent) @@ -130,6 +132,7 @@ If non-nil, alignment is done with the first parameter \(defun foo (arg1 arg2 &key key1 key2 key3 key4) #|...|#)" + :version "24.1" :type 'boolean :group 'lisp-indent) diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el index dbacba6cd29..88698a1f069 100644 --- a/lisp/emacs-lisp/easy-mmode.el +++ b/lisp/emacs-lisp/easy-mmode.el @@ -135,6 +135,8 @@ BODY contains code to execute each time the mode is enabled or disabled. the new state, and sets it. If you specify a :variable, this function does not define a MODE variable (nor any of the terms used in :variable). +:after-hook A single lisp form which is evaluated after the mode hooks + have been run. It should not be quoted. For example, you could write (define-minor-mode foo-mode \"If enabled, foo on you!\" @@ -170,6 +172,7 @@ For example, you could write (setter nil) ;The function (if any) to set the mode var. (modefun mode) ;The minor mode function name we're defining. (require t) + (after-hook nil) (hook (intern (concat mode-name "-hook"))) (hook-on (intern (concat mode-name "-on-hook"))) (hook-off (intern (concat mode-name "-off-hook"))) @@ -197,6 +200,7 @@ For example, you could write (setq mode variable) (setq mode (car variable)) (setq setter (cdr variable)))) + (:after-hook (setq after-hook (pop body))) (t (push keyw extra-keywords) (push (pop body) extra-keywords)))) (setq keymap-sym (if (and keymap (symbolp keymap)) keymap @@ -275,7 +279,8 @@ the mode if ARG is omitted or nil, and toggle it if ARG is `toggle'. (not (equal ,last-message (current-message)))) (message ,(format "%s %%sabled" pretty-name) - (if ,mode "en" "dis")))))) + (if ,mode "en" "dis"))))) + ,@(when after-hook `(,after-hook))) (force-mode-line-update) ;; Return the new setting. ,mode) diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el index 8c53ad58612..4efdc3240cd 100644 --- a/lisp/emacs-lisp/lisp.el +++ b/lisp/emacs-lisp/lisp.el @@ -257,9 +257,8 @@ is called as a function to find the defun's beginning." (if (> arg 0) (dotimes (i arg) (funcall beginning-of-defun-function)) - ;; Better not call end-of-defun-function directly, in case - ;; it's not defined. - (end-of-defun (- arg)))))) + (dotimes (i (- arg)) + (funcall end-of-defun-function)))))) ((or defun-prompt-regexp open-paren-in-column-0-is-defun-start) (and (< arg 0) (not (eobp)) (forward-char 1)) |