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

[Juanma Barranquero]

Index: emacs/lisp/hilit-chg.el
diff -c emacs/lisp/hilit-chg.el:1.32 emacs/lisp/hilit-chg.el:1.33
*** emacs/lisp/hilit-chg.el:1.32        Mon Jul  4 23:08:54 2005
--- emacs/lisp/hilit-chg.el     Fri Jul 22 02:20:29 2005
***************
*** 81,91 ****
  ;;
  ;; Example usage:
  ;; (defun my-highlight-changes-enable-hook ()
! ;;   (add-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)
  ;; )
  ;;
  ;; (defun my-highlight-changes-disable-hook ()
! ;;   (remove-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)
  ;; )
  ;;
  ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook)
--- 81,91 ----
  ;;
  ;; Example usage:
  ;; (defun my-highlight-changes-enable-hook ()
! ;;   (add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)
  ;; )
  ;;
  ;; (defun my-highlight-changes-disable-hook ()
! ;;   (remove-hook 'write-file-functions 'highlight-changes-rotate-faces t)
  ;; )
  ;;
  ;; (add-hook 'highlight-changes-enable-hook 'my-highlight-changes-enable-hook)
***************
*** 213,219 ****
  ;; indentation on inserts gets underlined (which can look pretty ugly!).
  
  (defface highlight-changes
!   '((((min-colors 88) (class color)) (:foreground "red1" ))
      (((class color)) (:foreground "red" ))
      (t (:inverse-video t)))
    "Face used for highlighting changes."
--- 213,219 ----
  ;; indentation on inserts gets underlined (which can look pretty ugly!).
  
  (defface highlight-changes
!   '((((min-colors 88) (class color)) (:foreground "red1"))
      (((class color)) (:foreground "red" ))
      (t (:inverse-video t)))
    "Face used for highlighting changes."
***************
*** 270,276 ****
  (defcustom highlight-changes-global-initial-state 'passive
    "*What state `global-highlight-changes' should start in.
  This is used if `global-highlight-changes' is called with no argument.
! This variable must be set to either `active' or `passive'"
    :type '(choice (const :tag "Active" active)
                 (const :tag "Passive" passive))
    :group 'highlight-changes)
--- 270,276 ----
  (defcustom highlight-changes-global-initial-state 'passive
    "*What state `global-highlight-changes' should start in.
  This is used if `global-highlight-changes' is called with no argument.
! This variable must be set to either `active' or `passive'."
    :type '(choice (const :tag "Active" active)
                 (const :tag "Passive" passive))
    :group 'highlight-changes)
***************
*** 302,309 ****
  Changes mode, or a list whose first element is `not' followed by major
  modes which are not suitable.
  
! t means the buffer is suitable if it is visiting a file and its name
! does not begin with ` ' or `*'.
  
  A value of nil means no buffers are suitable for `global-highlight-changes'
  \(effectively disabling the mode).
--- 302,309 ----
  Changes mode, or a list whose first element is `not' followed by major
  modes which are not suitable.
  
! A value of t means the buffer is suitable if it is visiting a file and
! its name does not begin with ` ' or `*'.
  
  A value of nil means no buffers are suitable for `global-highlight-changes'
  \(effectively disabling the mode).
***************
*** 488,494 ****
    "Fix change overlays in region between BEG and END.
  
  Ensure the overlays agree with the changes as determined from
! the text properties of type `hilit-chg' ."
    ;; Remove or alter overlays in region beg..end
    (let (ov-start ov-end        props q)
      ;; temp for debugging:
--- 488,494 ----
    "Fix change overlays in region between BEG and END.
  
  Ensure the overlays agree with the changes as determined from
! the text properties of type `hilit-chg'."
    ;; Remove or alter overlays in region beg..end
    (let (ov-start ov-end        props q)
      ;; temp for debugging:
***************
*** 641,652 ****
  \\[highlight-changes-remove-highlight] - remove the change face from the 
region
  \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
  through
!       various faces.
  
  Hook variables:
! `highlight-changes-enable-hook'  - when enabling Highlight Changes mode.
  `highlight-changes-toggle-hook'  - when entering active or passive state
! `highlight-changes-disable-hook' - when turning off Highlight Changes mode."
    (interactive "P")
    (if (or (display-color-p)
          (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
--- 641,652 ----
  \\[highlight-changes-remove-highlight] - remove the change face from the 
region
  \\[highlight-changes-rotate-faces] - rotate different \"ages\" of changes \
  through
!       various faces
  
  Hook variables:
! `highlight-changes-enable-hook'  - when enabling Highlight Changes mode
  `highlight-changes-toggle-hook'  - when entering active or passive state
! `highlight-changes-disable-hook' - when turning off Highlight Changes mode"
    (interactive "P")
    (if (or (display-color-p)
          (and (fboundp 'x-display-grayscale-p) (x-display-grayscale-p)))
***************
*** 781,791 ****
  face described by the second element, and so on.  Very old changes remain
  shown in the last face in the list.
  
! You can automatically rotate colors when the buffer is saved
! by adding the following to `local-write-file-hooks', by evaling it in the
! buffer to be saved):
  
!   \(add-hook 'local-write-file-hooks 'highlight-changes-rotate-faces)"
    (interactive)
    ;; If not in active mode do nothing but don't complain because this
    ;; may be bound to a hook.
--- 781,791 ----
  face described by the second element, and so on.  Very old changes remain
  shown in the last face in the list.
  
! You can automatically rotate colors when the buffer is saved by adding
! this function to `write-file-functions' as a buffer-local value.  To do
! this, eval the following in the buffer to be saved:
  
!   \(add-hook 'write-file-functions 'highlight-changes-rotate-faces nil t)"
    (interactive)
    ;; If not in active mode do nothing but don't complain because this
    ;; may be bound to a hook.
***************
*** 800,807 ****
        ;; and display them all if active
        (if (eq highlight-changes-mode 'active)
            (hilit-chg-display-changes))))
!   ;; This always returns nil so it is safe to use in
!   ;; local-write-file-hook
    nil)
  
  ;; ========================================================================
--- 800,806 ----
        ;; and display them all if active
        (if (eq highlight-changes-mode 'active)
            (hilit-chg-display-changes))))
!   ;; This always returns nil so it is safe to use in write-file-functions
    nil)
  
  ;; ========================================================================
***************
*** 886,892 ****
  If either buffer is modified and is visiting a file, you are prompted
  to save the file.
  
! Unless the buffer is unmodified and visiting a file,  the buffer is
  written to a temporary file for comparison.
  
  If a buffer is read-only, differences will be highlighted but no property
--- 885,891 ----
  If either buffer is modified and is visiting a file, you are prompted
  to save the file.
  
! Unless the buffer is unmodified and visiting a file, the buffer is
  written to a temporary file for comparison.
  
  If a buffer is read-only, differences will be highlighted but no property
***************
*** 1110,1118 ****
  
  A buffer is appropriate for Highlight Changes mode if all these are true:
  - the buffer is not a special buffer (one whose name begins with
!   `*' or ` ')
  - the buffer's mode is suitable as per variable
!   `highlight-changes-global-modes'
  - Highlight Changes mode is not already on for this buffer.
  
  This function is called from `hilit-chg-update-all-buffers' or
--- 1109,1117 ----
  
  A buffer is appropriate for Highlight Changes mode if all these are true:
  - the buffer is not a special buffer (one whose name begins with
!   `*' or ` '),
  - the buffer's mode is suitable as per variable
!   `highlight-changes-global-modes',
  - Highlight Changes mode is not already on for this buffer.
  
  This function is called from `hilit-chg-update-all-buffers' or