diff options
| author | Glenn Morris <rgm@gnu.org> | 2013-09-17 00:26:07 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2013-09-17 00:26:07 -0700 |
| commit | 39eb0cb563f5287270f3946804456dc766386638 (patch) | |
| tree | 227dbbed9d2d039e1531b01baa96c4e8e3d87c67 /lisp | |
| parent | b7ad2f7401a22e6189d1b0a0523a3f98d1f70be5 (diff) | |
| parent | 16af23266cd8671281d89ebb2c15d3acac7ba914 (diff) | |
| download | emacs-39eb0cb563f5287270f3946804456dc766386638.tar.gz | |
Merge from emacs-24; up to 2013-01-03T02:31:36Z!rgm@gnu.org
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/abbrev.el | 4 | ||||
| -rw-r--r-- | lisp/subr.el | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5809c2a4513..f36ed3ceebb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2013-09-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * subr.el (eval-after-load): Preserve evaluation order (bug#15389). + + * abbrev.el (abbrev--check-chars): Fix thinko (bug#15329). + 2013-09-16 Stefan Monnier <monnier@iro.umontreal.ca> * icomplete.el (icomplete-in-buffer): New var. diff --git a/lisp/abbrev.el b/lisp/abbrev.el index d7d4482693d..458d8741ac8 100644 --- a/lisp/abbrev.el +++ b/lisp/abbrev.el @@ -607,9 +607,9 @@ An obsolete but still supported calling form is: "Check if the characters in ABBREV have word syntax in either the current (if global is nil) or standard syntax table." (with-syntax-table - (cond ((null global) (standard-syntax-table)) + (cond ((null global) (syntax-table)) ;; ((syntax-table-p global) global) - (t (syntax-table))) + (t (standard-syntax-table))) (when (string-match "\\W" abbrev) (let ((badchars ()) (pos 0)) diff --git a/lisp/subr.el b/lisp/subr.el index 7df1e86b5bf..f8b5d605f91 100644 --- a/lisp/subr.el +++ b/lisp/subr.el @@ -3878,7 +3878,7 @@ This function makes or adds to an entry on `after-load-alist'." (when (equal file lfn) (remove-hook 'after-load-functions fun) (funcall func)))) - (add-hook 'after-load-functions fun))))))) + (add-hook 'after-load-functions fun 'append))))))) ;; Add FORM to the element unless it's already there. (unless (member delayed-func (cdr elt)) (nconc elt (list delayed-func))))))) |