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

[Juanma Barranquero]

Index: emacs/lisp/progmodes/sh-script.el
diff -c emacs/lisp/progmodes/sh-script.el:1.112 
emacs/lisp/progmodes/sh-script.el:1.113
*** emacs/lisp/progmodes/sh-script.el:1.112     Fri Sep  6 03:17:05 2002
--- emacs/lisp/progmodes/sh-script.el   Tue Sep 24 06:17:46 2002
***************
*** 2655,2667 ****
  
  (defun sh-mark-init (buffer)
    "Initialize a BUFFER to be used by `sh-mark-line'."
!   (let ((main-buffer (current-buffer)))
!     (save-excursion
!       (set-buffer (get-buffer-create buffer))
!       (erase-buffer)
!       (occur-mode)
!       (setq occur-buffer main-buffer)
!       )))
  
  
  (defun sh-mark-line (message point buffer &optional add-linenum occur-point)
--- 2655,2665 ----
  
  (defun sh-mark-init (buffer)
    "Initialize a BUFFER to be used by `sh-mark-line'."
!   (save-excursion
!     (set-buffer (get-buffer-create buffer))
!     (erase-buffer)
!     (occur-mode)
!     ))
  
  
  (defun sh-mark-line (message point buffer &optional add-linenum occur-point)
***************
*** 2671,2677 ****
  If OCCUR-POINT is non-nil then the line is marked as a new occurrence
  so that `occur-next' and `occur-prev' will work."
    (let ((m1 (make-marker))
-       (main-buffer (current-buffer))
        start
        (line ""))
      (when point
--- 2669,2674 ----
***************
*** 2683,2689 ****
          (set-buffer (get-buffer buffer))
        (set-buffer (get-buffer-create buffer))
        (occur-mode)
-       (setq occur-buffer main-buffer)
        )
        (goto-char (point-max))
        (setq start (point))
--- 2680,2685 ----
***************
*** 2699,2708 ****
        (insert "\n")
        (if point
          (progn
!           (put-text-property start (point) 'occur m1)
            (if occur-point
!               (put-text-property occur-point (1+ occur-point)
!                                  'occur-point t))
            ))
        )))
  
--- 2695,2704 ----
        (insert "\n")
        (if point
          (progn
!           (put-text-property start (point) 'occur-target m1)
            (if occur-point
!               (put-text-property start occur-point
!                                  'occur-match t))
            ))
        )))