Mercurial > emacs
diff lisp/progmodes/sh-script.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Jul 2005 08:02:00 +0000 |
parents | f9a65d7ebd29 a634aa374675 |
children | 2d92f5c9d6ae |
line wrap: on
line diff
--- a/lisp/progmodes/sh-script.el Thu Jul 07 12:43:14 2005 +0000 +++ b/lisp/progmodes/sh-script.el Thu Jul 14 08:02:00 2005 +0000 @@ -2033,11 +2033,20 @@ ;; Continuation lines are handled specially (if (sh-this-is-a-continuation) (progn - ;; We assume the line being continued is already - ;; properly indented... - ;; (setq prev-line-end (sh-prev-line)) - (setq align-point (sh-prev-line nil)) - (setq result (list '(+ sh-indent-for-continuation))) + (setq result + (if (save-excursion + (beginning-of-line) + (not (memq (char-before (- (point) 2)) '(?\s ?\t)))) + ;; By convention, if the continuation \ is not + ;; preceded by a SPC or a TAB it means that the line + ;; is cut at a place where spaces cannot be freely + ;; added/removed. I.e. do not indent the line. + (list '(= nil)) + ;; We assume the line being continued is already + ;; properly indented... + ;; (setq prev-line-end (sh-prev-line)) + (setq align-point (sh-prev-line nil)) + (list '(+ sh-indent-for-continuation)))) (setq have-result t)) (beginning-of-line) (skip-chars-forward " \t") @@ -2130,10 +2139,9 @@ (sh-debug "result is now: %s" result) (or result - (if prev-line-end - (setq result (list (list t prev-line-end))) - (setq result (list (list '= 'sh-first-lines-indent))) - )) + (setq result (list (if prev-line-end + (list t prev-line-end) + (list '= 'sh-first-lines-indent))))) (if (eq result t) (setq result nil)) @@ -2695,11 +2703,9 @@ (defun sh-mark-init (buffer) "Initialize a BUFFER to be used by `sh-mark-line'." - (save-excursion - (set-buffer (get-buffer-create buffer)) + (with-current-buffer (get-buffer-create buffer) (erase-buffer) - (occur-mode) - )) + (occur-mode))) (defun sh-mark-line (message point buffer &optional add-linenum occur-point) @@ -2972,8 +2978,7 @@ (let ((var (car learned-var))) (sh-mark-line (format " %s %s" var (symbol-value var)) (nth 2 learned-var) out-buffer))) - (save-excursion - (set-buffer out-buffer) + (with-current-buffer out-buffer (goto-char (point-min)) (insert (format "Indentation values for buffer %s.\n" name) @@ -3244,8 +3249,7 @@ t means to return a list of all possible completions of STRING. `lambda' means to return t if STRING is a valid completion as it stands." (let ((sh-shell-variables - (save-excursion - (set-buffer sh-add-buffer) + (with-current-buffer sh-add-buffer (or sh-shell-variables-initialized (sh-shell-initialize-variables)) (nconc (mapcar (lambda (var)