[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111617: * lisp/hi-lock.el (hi-lock-u
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111617: * lisp/hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol. |
Date: |
Mon, 28 Jan 2013 15:00:35 -0500 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111617
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13297
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-01-28 15:00:35 -0500
message:
* lisp/hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol.
modified:
lisp/ChangeLog
lisp/hi-lock.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-01-28 02:07:42 +0000
+++ b/lisp/ChangeLog 2013-01-28 20:00:35 +0000
@@ -1,11 +1,16 @@
+2013-01-28 Stefan Monnier <address@hidden>
+
+ * hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol
+ (bug#13297).
+
2013-01-27 Dmitry Gutov <address@hidden>
* progmodes/ruby-mode.el (ruby-font-lock-keywords): Remove some
checks made superfluous by the \_< operator.
* progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe
temporarily) broken indentation.
- * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
- nested constants, too. \_< broke that.
+ * progmodes/ruby-mode.el (ruby-font-lock-keywords):
+ Highlight nested constants, too. \_< broke that.
2013-01-27 Nobuyoshi Nakada <address@hidden>
@@ -117,8 +122,8 @@
2013-01-22 Michael Albinus <address@hidden>
- * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers): Mark
- descriptive parts with `display' property.
+ * net/tramp-cmds.el (tramp-bug, tramp-append-tramp-buffers):
+ Mark descriptive parts with `display' property.
2013-01-21 Agustín Martín Domingo <address@hidden>
@@ -147,13 +152,13 @@
* net/tramp-adb.el (top): Require `time-date'.
(tramp-adb-ls-output-time-less-p): Use `tramp-time-less-p'.
- (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file): Use
- `tramp-file-name-handler'.
- (tramp-adb-maybe-open-connection): Use
- `tramp-compat-set-process-query-on-exit-flag'.
+ (tramp-adb-handle-copy-file, tramp-adb-handle-rename-file):
+ Use `tramp-file-name-handler'.
+ (tramp-adb-maybe-open-connection):
+ Use `tramp-compat-set-process-query-on-exit-flag'.
- * net/tramp-sh.el (tramp-sh-handle-file-acl): Use
- `tramp-compat-funcall'.
+ * net/tramp-sh.el (tramp-sh-handle-file-acl):
+ Use `tramp-compat-funcall'.
* net/tramp-smb.el (tramp-smb-handle-file-acl): Use `looking-at' and
`tramp-compat-funcall'.
@@ -193,8 +198,8 @@
2013-01-19 Christian Wittern <address@hidden> (tiny change)
Chong Yidong <address@hidden>
- * image-mode.el (image-next-file, image-previous-file): New
- commands (Bug#8453).
+ * image-mode.el (image-next-file, image-previous-file):
+ New commands (Bug#8453).
(image-mode-map): Bind them to n and p.
(image-mode--images-in-directory): New helper function.
@@ -222,8 +227,8 @@
* autorevert.el (auto-revert-use-notify): In the :set function, do
not modify `kill-buffer-hook'.
- (auto-revert-notify-rm-watch): Remove
- `auto-revert-notify-rm-watch' from `kill-buffer-hook'.
+ (auto-revert-notify-rm-watch):
+ Remove `auto-revert-notify-rm-watch' from `kill-buffer-hook'.
(auto-revert-notify-add-watch): Do not call
`auto-revert-notify-rm-watch', but add it to a buffer local
`kill-buffer-hook'.
=== modified file 'lisp/hi-lock.el'
--- a/lisp/hi-lock.el 2013-01-02 16:13:04 +0000
+++ b/lisp/hi-lock.el 2013-01-28 20:00:35 +0000
@@ -562,7 +562,8 @@
(when keyword
(let ((face (hi-lock-keyword->face keyword)))
;; Make `face' the next one to use by default.
- (add-to-list 'hi-lock--unused-faces (face-name face)))
+ (when (symbolp face) ;Don't add it if it's a list (bug#13297).
+ (add-to-list 'hi-lock--unused-faces (face-name face))))
(font-lock-remove-keywords nil (list keyword))
(setq hi-lock-interactive-patterns
(delq keyword hi-lock-interactive-patterns))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111617: * lisp/hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol.,
Stefan Monnier <=