aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Richard2015-04-03 12:28:40 +0200
committerNicolas Richard2015-04-03 13:57:42 +0200
commit7c691f32f78303750d29972a29dcc6754fae257a (patch)
tree8728126888969bdad883adb32a9741462a8d69eb
parent2d45a5be18ee61e23dfe6af4e23f1eda3595b22c (diff)
downloademacs-7c691f32f78303750d29972a29dcc6754fae257a.tar.gz
emacs-7c691f32f78303750d29972a29dcc6754fae257a.zip
pcmpl-ssh-known-hosts: Use `char-before' instead of `looking-back'.
Fixes: debbugs:17284 * lisp/pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead of `looking-back'.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/pcmpl-unix.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b004a2bba96..7a4293b16ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12015-04-03 Nicolas Richard <theonewiththeevillook@yahoo.fr>
2
3 * pcmpl-unix.el (pcmpl-ssh-known-hosts): Use `char-before' instead
4 of `looking-back' (bug#17284).
5
12015-04-03 Dmitry Gutov <dgutov@yandex.ru> 62015-04-03 Dmitry Gutov <dgutov@yandex.ru>
2 7
3 * progmodes/js.el (js-indent-line): Do nothing when bol is inside 8 * progmodes/js.el (js-indent-line): Do nothing when bol is inside
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 3598cd64b46..7be57e9c93a 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -157,7 +157,7 @@ documentation), this function returns nil."
157 (while (re-search-forward (concat "^ *" host-re) nil t) 157 (while (re-search-forward (concat "^ *" host-re) nil t)
158 (add-to-list 'ssh-hosts-list (concat (match-string 1) 158 (add-to-list 'ssh-hosts-list (concat (match-string 1)
159 (match-string 2))) 159 (match-string 2)))
160 (while (and (looking-back ",") 160 (while (and (eq (char-before) ?,)
161 (re-search-forward host-re (line-end-position) t)) 161 (re-search-forward host-re (line-end-position) t))
162 (add-to-list 'ssh-hosts-list (concat (match-string 1) 162 (add-to-list 'ssh-hosts-list (concat (match-string 1)
163 (match-string 2))))) 163 (match-string 2)))))