[Emacs-diffs] Changes to emacs/lisp/imenu.el

[Kim F . Storm]

Index: emacs/lisp/imenu.el
diff -c emacs/lisp/imenu.el:1.101 emacs/lisp/imenu.el:1.102
*** emacs/lisp/imenu.el:1.101   Tue Oct 26 21:38:09 2004
--- emacs/lisp/imenu.el Thu Oct 28 14:11:32 2004
***************
*** 161,176 ****
    :type 'integer
    :group 'imenu)
  
! (defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)"
!   "*Progress message during the index scanning of the buffer.
! If non-nil, user gets a message during the scanning of the buffer.
! 
! Relevant only if the mode-specific function that creates the buffer
! index use `imenu-progress-message', and not useful if that is fast, in
! which case you might as well set this to nil."
!   :type '(choice string
!                (const :tag "None" nil))
!   :group 'imenu)
  
  (defcustom imenu-space-replacement "."
    "*The replacement string for spaces in index names.
--- 161,177 ----
    :type 'integer
    :group 'imenu)
  
! ;; No longer used.  KFS 2004-10-27
! ;; (defcustom imenu-scanning-message "Scanning buffer for index (%3d%%)"
! ;;   "*Progress message during the index scanning of the buffer.
! ;; If non-nil, user gets a message during the scanning of the buffer.
! ;;
! ;; Relevant only if the mode-specific function that creates the buffer
! ;; index use `imenu-progress-message', and not useful if that is fast, in
! ;; which case you might as well set this to nil."
! ;;   :type '(choice string
! ;;             (const :tag "None" nil))
! ;;   :group 'imenu)
  
  (defcustom imenu-space-replacement "."
    "*The replacement string for spaces in index names.
***************
*** 300,315 ****
  ;; is calculated.
  ;; PREVPOS is the variable in which we store the last position displayed.
  (defmacro imenu-progress-message (prevpos &optional relpos reverse)
!   `(and
!     imenu-scanning-message
!     (let ((pos ,(if relpos
!                   relpos
!                 `(imenu--relative-position ,reverse))))
!       (if ,(if relpos t
!            `(> pos (+ 5 ,prevpos)))
!         (progn
!           (message imenu-scanning-message pos)
!           (setq ,prevpos pos))))))
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- 301,322 ----
  ;; is calculated.
  ;; PREVPOS is the variable in which we store the last position displayed.
  (defmacro imenu-progress-message (prevpos &optional relpos reverse)
! 
! ;; Made obsolete/empty, as computers are now faster than the eye, and
! ;; it had problems updating the messages correctly, and could shadow
! ;; more important messages/prompts in the minibuffer.  KFS 2004-10-27.
! 
! ;;  `(and
! ;;    imenu-scanning-message
! ;;    (let ((pos ,(if relpos
! ;;                relpos
! ;;              `(imenu--relative-position ,reverse))))
! ;;      (if ,(if relpos t
! ;;         `(> pos (+ 5 ,prevpos)))
! ;;      (progn
! ;;        (message imenu-scanning-message pos)
! ;;        (setq ,prevpos pos)))))
! )
  
  
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
***************
*** 765,771 ****
   (INDEX-NAME . INDEX-POSITION)
  or like:
   (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...)
! They may also be nested index alists like: 
   (INDEX-NAME . INDEX-ALIST)
  depending on PATTERNS."
  
--- 772,778 ----
   (INDEX-NAME . INDEX-POSITION)
  or like:
   (INDEX-NAME INDEX-POSITION FUNCTION ARGUMENTS...)
! They may also be nested index alists like:
   (INDEX-NAME . INDEX-ALIST)
  depending on PATTERNS."