diff options
| author | Samer Masterson <nosefrog@gmail.com> | 2015-02-24 14:03:54 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2015-02-24 14:03:54 -0500 |
| commit | 450bebaec94611f0958e13e35faf494e17931f8e (patch) | |
| tree | 2b68e77e3dda7a9981f14eb872287d46d587619b /lisp/hi-lock.el | |
| parent | feb49cb7a481f988350899c748ba5582ffac5bf7 (diff) | |
| download | emacs-450bebaec94611f0958e13e35faf494e17931f8e.tar.gz | |
* lisp/eshell: Fix history substitution error
Fixes: debbugs:18960
* lisp/eshell/em-hist.el (eshell-hist-parse-word-designator):
Return args joined with " ".
* lisp/eshell/em-pred.el (eshell-parse-modifiers): Correct docstring.
(eshell-hist-parse-modifier): Pass mod a list instead of a string.
Diffstat (limited to 'lisp/hi-lock.el')
| -rw-r--r-- | lisp/hi-lock.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index d74664a845f..0255585f532 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -600,7 +600,7 @@ then remove all hi-lock highlighting." ;; `font-lock-specified-p' to go from nil to non-nil (because it ;; calls font-lock-set-defaults). This is yet-another bug in ;; font-lock-add/remove-keywords, which we circumvent here by - ;; testing `font-lock-fontified' (bug#19737). + ;; testing `font-lock-fontified' (bug#19796). (if font-lock-fontified (font-lock-remove-keywords nil (list keyword))) (setq hi-lock-interactive-patterns (delq keyword hi-lock-interactive-patterns)) |