* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c50f25e3766105e5ea73b0a472456e6d56311e2..b152a752115b9523cff8143ee990f076d228b634 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-24  Samer Masterson  <nosefrog@gmail.com>
+
+       * eshell/em-hist.el (eshell-hist-parse-word-designator):
+       Return args joined with " ".
+       * eshell/em-pred.el (eshell-parse-modifiers): Correct docstring.
+       (eshell-hist-parse-modifier): Pass mod a list instead of a string
+       (bug#18960).
+
 2015-02-24  Karl Fogel  <kfogel@red-bean.com>  (tiny change)
 
        * comint.el (comint-mode-map): Fix obvious typo.
@@ -100,8 +108,8 @@
        (verilog-auto-inst, verilog-auto-inst-param):
        Use arguments rather than vector-skip.
        (verilog-auto-inst-port): Fix AUTOINST interfaces to not show
-       modport if signal attachment is itself a modport.  Reported by
-       Matthew Lovell.
+       modport if signal attachment is itself a modport.
+       Reported by Matthew Lovell.
 
 2015-02-21  Reto Zimmermann  <reto@gnu.org>
 
@@ -341,7 +349,7 @@
 2015-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * hi-lock.el (hi-lock-unface-buffer): Don't call
-       font-lock-remove-keywords if not needed (bug#19737).
+       font-lock-remove-keywords if not needed (bug#19796).
 
 2015-02-11  Artur Malabarba  <bruce.connor.am@gmail.com>
 
@@ -1622,7 +1630,7 @@
        * vc/vc-svn.el (vc-svn-dir-status-files): Pass t as
        vc-svn-after-dir-status's second argument.  (Bug#19429)
 
-2015-01-16  Samer Masterson  <samer@samertm.com>  (tiny change)
+2015-01-16  Samer Masterson  <samer@samertm.com>
 
        * pcomplete.el (pcomplete-parse-arguments): Parse arguments
        regardless of pcomplete-cycle-completions's value.  (Bug#18950)

diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 55c83e45226024eae3c9e31ab7376ee34dffa073..1cdf6d69714d6e6b429a4e4ae7f7d355f40d01ed 100644 (file)
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -724,7 +724,7 @@ matched."
        (setq nth (eshell-hist-word-reference nth)))
       (unless (numberp mth)
        (setq mth (eshell-hist-word-reference mth)))
-      (cons (mapconcat 'identity (eshell-sublist textargs nth mth) "")
+      (cons (mapconcat 'identity (eshell-sublist textargs nth mth) " ")
            end))))
 
 (defun eshell-hist-parse-modifier (hist reference)
@@ -737,7 +737,7 @@ matched."
          (goto-char (point-min))
          (let ((modifiers (cdr (eshell-parse-modifiers))))
            (dolist (mod modifiers)
-             (setq hist (funcall mod hist)))
+             (setq hist (car (funcall mod (list hist)))))
            hist))
       (delete-region here (point)))))
 

diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index abaa99eff23a3c8486815d78692997eaaff463ee..289d37dd580e7198f379aab52e810093610a2c12 100644 (file)
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -119,7 +119,8 @@ The format of each entry is
                (function
                 (lambda (str)
                   (eshell-stringify
-                   (car (eshell-parse-argument str))))) lst)))
+                   (car (eshell-parse-argument str)))))
+               lst)))
     (?L . #'(lambda (lst) (mapcar 'downcase lst)))
     (?U . #'(lambda (lst) (mapcar 'upcase lst)))
     (?C . #'(lambda (lst) (mapcar 'capitalize lst)))
@@ -296,16 +297,15 @@ This function is specially for adding onto `eshell-parse-argument-hook'."
 
 (defun eshell-parse-modifiers ()
   "Parse value modifiers and predicates at point.
-If ALLOW-PREDS is non-nil, predicates will be parsed as well.
 Return a cons cell of the form
 
   (PRED-FUNC-LIST . MOD-FUNC-LIST)
 
-NEW-STRING is STRING minus any modifiers.  PRED-FUNC-LIST is a list of
-predicate functions.  MOD-FUNC-LIST is a list of result modifier
-functions.  PRED-FUNCS take a filename and return t if the test
-succeeds; MOD-FUNCS take any string and preform a modification,
-returning the resultant string."
+PRED-FUNC-LIST is a list of predicate functions.  MOD-FUNC-LIST
+is a list of result modifier functions.  PRED-FUNCS take a
+filename and return t if the test succeeds; MOD-FUNCS take any
+list of strings and perform a modification, returning the
+resultant list of strings."
   (let (negate follow preds mods)
     (condition-case nil
        (while (not (eobp))

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index d74664a845ff8adde3bb00920655bd3d21208007..0255585f5321c0985b40c3699ca03b8609babf48 100644 (file)
--- 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))