diff options
author | Juanma Barranquero <lekktu@gmail.com> | 2006-12-30 02:00:28 +0000 |
---|---|---|
committer | Juanma Barranquero <lekktu@gmail.com> | 2006-12-30 02:00:28 +0000 |
commit | c1248ba7ac66831e48bcaff3f8354e3901bbce0a (patch) | |
tree | d810b69b958203adeb8839f8ebd25897ba9502bd /lisp | |
parent | 305018c684d36b1e734fd5663b6226a3ba28d396 (diff) | |
download | emacs-c1248ba7ac66831e48bcaff3f8354e3901bbce0a.tar.gz |
Removed spurious entry of 2006-12-24, duplicated on 2006-12-26.
Diffstat (limited to 'lisp')
-rw-r--r-- | lisp/ChangeLog | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bdf62baa16e..959d5c377ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2006-12-30 Juanma Barranquero <lekktu@gmail.com> + + * image.el (image-type-header-regexps, image-type-from-data) + (image-type-from-buffer, image-type-from-file-header): + Revert changes from 2006-12-26. + (image-type-auto-detectable): New variable. + (image-type-auto-detected-p): New function. + + * files.el (magic-mode-alist): Detect image files with + `image-type-auto-detected-p' instead of `image-type-from-buffer'. + 2006-12-29 Nick Roberts <nickrob@snap.net.nz> * dired.el (dired-sort-other): Move test for dired-mode... @@ -73,7 +84,7 @@ (image-type-from-buffer): Handle new format. New arg INCLUDE-MAYBES. (image-type-from-file-header): Pass t for INCLUDE-MAYBES. -2006-12-26 Guanpeng Xu <herberteuler@hotmail.com> (tiny change) +2006-12-26 Guanpeng Xu <herberteuler@hotmail.com> (tiny change) * add-log.el (add-log-current-defun): Call `forward-sexp' multiple times to pick a member function name defined as @@ -126,15 +137,6 @@ in March. (calendar-dst-ends): Default to first Sunday in November. -2006-12-24 Richard Stallman <rms@gnu.org> - - * image.el (image-type-header-regexps): Element is now (REGEXP - IMAGE-TYPE NOT-ALWAYS). - (image-type-from-data): Handle new format of image-type-header-regexps. - (image-type-from-buffer): Likewise. - New arg INCLUDE-MAYBES. - (image-type-from-file-header): Pass t for INCLUDE-MAYBES. - 2006-12-24 Ken Manheimer <ken.manheimer@gmail.com> * allout.el (allout-encrypt-string): Inhibit use of agent within |