diff options
| author | Miles Bader <miles@gnu.org> | 2008-09-02 05:35:54 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2008-09-02 05:35:54 +0000 |
| commit | 9850eff524bd0747a9561f3b4c90dfc3749f4ecb (patch) | |
| tree | c05e918b9763310aea577eefc476aaccf20eb86a /lisp | |
| parent | 9a73a6c9dbd5a98e8e27cccbf1361f89070b94e7 (diff) | |
| parent | 7f02dd2cf6cb7395cb06104fd052f08cc91e9e10 (diff) | |
| download | emacs-9850eff524bd0747a9561f3b4c90dfc3749f4ecb.tar.gz | |
Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1398
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 19 | ||||
| -rw-r--r-- | lisp/emulation/tpu-edt.el | 5 | ||||
| -rw-r--r-- | lisp/image-mode.el | 2 | ||||
| -rw-r--r-- | lisp/tool-bar.el | 2 |
4 files changed, 24 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 2bf5de6f14b..86f7aa4f57b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,22 @@ +2008-09-02 Chong Yidong <cyd@stupidchicken.com> + + * image-mode.el (image-mode): Fix 2008-07-19 change. + +2008-09-02 Juanma Barranquero <lekktu@gmail.com> + + * tool-bar.el (tool-bar-add-item): Fix typo in docstring. + + * emulation/tpu-edt.el (tpu-match-beginning, tpu-match-end) + (tpu-check-match, tpu-goto-breadcrumb, tpu-reset-screen-size) + (tpu-toggle-overwrite-mode, tpu-include, tpu-get, tpu-what-line) + (tpu-insert-escape, tpu-insert-formfeed, tpu-end-define-macro-key) + (tpu-check-search-case, tpu-select, tpu-unselect, tpu-trim-line-ends) + (tpu-toggle-control-keys): Fix typos in docstrings. + (tpu-kill-buffer): Doc fix. + (tpu-make-file-buffer-list, tpu-toggle-regexp, tpu-cut) + (tpu-append-region, tpu-delete-current-char, tpu-emacs-replace): + Reflow docstrings. + 2008-09-02 Glenn Morris <rgm@gnu.org> * emacs-lisp/lucid.el (try-face-font): Remove dead alias. diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el index 7aea44c11d9..8f1e9e36c3e 100644 --- a/lisp/emulation/tpu-edt.el +++ b/lisp/emulation/tpu-edt.el @@ -1246,8 +1246,9 @@ and the total number of lines in the buffer." ;;; Buffers and Windows ;;; (defun tpu-kill-buffer nil - "Kill the current buffer. If tpu-kill-buffers-silently is non-nil, -kills modified buffers without asking." + "Kill the current buffer. +If `tpu-kill-buffers-silently' is non-nil, +kill modified buffers without asking." (interactive) (if tpu-kill-buffers-silently (set-buffer-modified-p nil)) (kill-buffer (current-buffer))) diff --git a/lisp/image-mode.el b/lisp/image-mode.el index 6687ed3fed4..ec3a66e0dc1 100644 --- a/lisp/image-mode.el +++ b/lisp/image-mode.el @@ -332,7 +332,7 @@ to toggle between display as an image and display as text." (add-hook 'change-major-mode-hook 'image-toggle-display-text nil t) (if (display-images-p) - (if (not (image-get-display-property)) + (if (not (get-text-property (point-min) 'display)) (image-toggle-display) ;; Set next vars when image is already displayed but local ;; variables were cleared by kill-all-local-variables diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index 14cbc57f029..85d3ba5b705 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -133,7 +133,7 @@ PROPS are additional items to add to the menu item specification. See Info node `(elisp)Tool Bar'. Items are added from left to right. ICON is the base name of a file containing the image to use. The -function will first try to use low-color/ICON.xpm if display-color-cells +function will first try to use low-color/ICON.xpm if `display-color-cells' is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally ICON.xbm, using `find-image'. |