diff options
| author | Glenn Morris | 2011-05-12 00:07:06 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-12 00:07:06 -0700 |
| commit | d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68 (patch) | |
| tree | e6d877c35b4396bd5092a7be244b1527374d4a0e /lisp/ChangeLog | |
| parent | d45885f7e0025fb5bd0756ba78c511a981d64533 (diff) | |
| parent | e531bdfff1ee57a0ba4af6c8575ed7856e4c86d2 (diff) | |
| download | emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.tar.gz emacs-d2fc7e3d0f6f57f962cbd94df3bf4fd15a37bb68.zip | |
Merge from emacs-23; up to 2010-06-10T12:56:11Z!michael.albinus@gmx.de.
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b223382b271..d1348485002 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,19 @@ | |||
| 1 | 2011-05-12 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * smerge-mode.el (smerge-resolve): Use null-device rather than a | ||
| 4 | literal "/dev/null". | ||
| 5 | |||
| 6 | 2011-05-12 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 7 | |||
| 8 | * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point): | ||
| 9 | Fix typo. | ||
| 10 | |||
| 11 | 2011-05-12 Ralph Schleicher <rs@ralph-schleicher.de> | ||
| 12 | |||
| 13 | * progmodes/which-func.el (which-function): | ||
| 14 | Use add-log-current-defun instead of add-log-current-defun-function, | ||
| 15 | which might not be defined (Bug#8260). | ||
| 16 | |||
| 1 | 2011-05-12 Glenn Morris <rgm@gnu.org> | 17 | 2011-05-12 Glenn Morris <rgm@gnu.org> |
| 2 | 18 | ||
| 3 | * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble): | 19 | * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble): |