diff options
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/image.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e208b06189e..f1714548a98 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-10-22 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * image.el (imagemagick-enabled-types): Doc fix. | ||
| 4 | |||
| 1 | 2012-10-22 Takafumi Arakaki <aka.tkf@gmail.com> (tiny change) | 5 | 2012-10-22 Takafumi Arakaki <aka.tkf@gmail.com> (tiny change) |
| 2 | 6 | ||
| 3 | * progmodes/which-func.el (which-func-current): The hash-table may have | 7 | * progmodes/which-func.el (which-func-current): The hash-table may have |
diff --git a/lisp/image.el b/lisp/image.el index 72dc654757a..56c2fdff23f 100644 --- a/lisp/image.el +++ b/lisp/image.el | |||
| @@ -798,7 +798,7 @@ to enable all types that ImageMagick supports. | |||
| 798 | 798 | ||
| 799 | The variable `imagemagick-types-inhibit' overrides this variable. | 799 | The variable `imagemagick-types-inhibit' overrides this variable. |
| 800 | 800 | ||
| 801 | If you change this without outside of Customize, you must call | 801 | If you change this without using customize, you must call |
| 802 | `imagemagick-register-types' afterwards. | 802 | `imagemagick-register-types' afterwards. |
| 803 | 803 | ||
| 804 | If Emacs is compiled without ImageMagick support, this variable | 804 | If Emacs is compiled without ImageMagick support, this variable |