diff options
| author | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2005-05-26 05:42:19 +0000 |
| commit | d2eeec7fb90dc54c4b08e85f452a23317c0ee65d (patch) | |
| tree | cd13677b902ee91ff96c5f43ca30ae2aba828312 /lisp/progmodes/sh-script.el | |
| parent | 5611ba87dd81c98d2cc00a4d01e19db3d26cf9d5 (diff) | |
| parent | c0e9b2d0ec9cb343733243371efecf77722b067f (diff) | |
| download | emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.gz emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.tar.bz2 emacs-d2eeec7fb90dc54c4b08e85f452a23317c0ee65d.zip | |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-55
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 320-323)
- Update from CVS
Diffstat (limited to 'lisp/progmodes/sh-script.el')
| -rw-r--r-- | lisp/progmodes/sh-script.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el index 0173c419b5d..87915933862 100644 --- a/lisp/progmodes/sh-script.el +++ b/lisp/progmodes/sh-script.el @@ -1389,7 +1389,7 @@ with your script for an edit-interpret-debug cycle." (cond ((looking-at "#![ \t]?\\([^ \t\n]*/bin/env[ \t]\\)?\\([^ \t\n]+\\)") (match-string 2)) ((and buffer-file-name - (string-match "\\.m?spec$" buffer-file-name)) + (string-match "\\.m?spec\\'" buffer-file-name)) "rpm"))))) (sh-set-shell (or interpreter sh-shell-file) nil nil)) (run-hooks 'sh-mode-hook)) @@ -2290,7 +2290,7 @@ we go to the end of the previous line and do not check for continuations." (if (looking-at "[\"'`]") (sh-safe-forward-sexp) ;; (> (skip-chars-forward "^ \t\n\"'`") 0) - (> (skip-chars-forward "-_a-zA-Z\$0-9") 0) + (> (skip-chars-forward "-_a-zA-Z$0-9") 0) )) (buffer-substring start (point)) )) |