[Emacs-diffs] Changes to emacs/lisp/progmodes/sh-script.el

[D . Goel]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.164 
emacs/lisp/progmodes/sh-script.el:1.165
*** emacs/lisp/progmodes/sh-script.el:1.164     Fri Sep  9 01:26:00 2005
--- emacs/lisp/progmodes/sh-script.el   Sun Sep 18 12:31:28 2005
***************
*** 2572,2580 ****
    (if (numberp blinkpos)
        (save-excursion
        (goto-char blinkpos)
!       (message msg)
        (sit-for blink-matching-delay))
!     (message msg)))
  
  (defun sh-show-indent (arg)
    "Show the how the currently line would be indented.
--- 2572,2580 ----
    (if (numberp blinkpos)
        (save-excursion
        (goto-char blinkpos)
!       (if msg (message "%s" msg) (message nil))
        (sit-for blink-matching-delay))
!     (if message (message "%s" msg) (message nil))))
  
  (defun sh-show-indent (arg)
    "Show the how the currently line would be indented.
***************
*** 2591,2597 ****
         (curr-indent (current-indentation))
         val msg)
      (if (stringp var)
!       (message (setq msg var))
        (setq val (sh-calculate-indent info))
  
        (if (eq curr-indent val)
--- 2591,2597 ----
         (curr-indent (current-indentation))
         val msg)
      (if (stringp var)
!       (message "%s" (setq msg var))
        (setq val (sh-calculate-indent info))
  
        (if (eq curr-indent val)
***************
*** 2610,2617 ****
          (if (and info (listp (car info))
                   (eq (car (car info)) t))
              (sh-blink (nth 1 (car info))  msg)
!           (message msg)))
!       (message msg))
      ))
  
  (defun sh-set-indent ()
--- 2610,2617 ----
          (if (and info (listp (car info))
                   (eq (car (car info)) t))
              (sh-blink (nth 1 (car info))  msg)
!           (message "%s" msg)))
!       (message "%s" msg))
      ))
  
  (defun sh-set-indent ()
***************
*** 2624,2630 ****
         (var (sh-get-indent-var-for-line info))
         val old-val indent-val)
      (if (stringp var)
!       (message (format "Cannot set indent - %s" var))
        (setq old-val (symbol-value var))
        (setq val (sh-read-variable var))
        (condition-case nil
--- 2624,2630 ----
         (var (sh-get-indent-var-for-line info))
         val old-val indent-val)
      (if (stringp var)
!       (message "Cannot set indent - %s" var)
        (setq old-val (symbol-value var))
        (setq val (sh-read-variable var))
        (condition-case nil
***************
*** 2675,2681 ****
           (curr-indent (current-indentation)))
        (cond
         ((stringp var)
!       (message (format "Cannot learn line - %s" var)))
         ((eq var 'sh-indent-comment)
        ;; This is arbitrary...
        ;; - if curr-indent is 0, set to curr-indent
--- 2675,2681 ----
           (curr-indent (current-indentation)))
        (cond
         ((stringp var)
!       (message "Cannot learn line - %s" var))
         ((eq var 'sh-indent-comment)
        ;; This is arbitrary...
        ;; - if curr-indent is 0, set to curr-indent