[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/hilit-chg.el
From: |
Juanma Barranquero |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/hilit-chg.el |
Date: |
Fri, 10 Jun 2005 10:03:52 -0400 |
Index: emacs/lisp/hilit-chg.el
diff -c emacs/lisp/hilit-chg.el:1.29 emacs/lisp/hilit-chg.el:1.30
*** emacs/lisp/hilit-chg.el:1.29 Fri Jun 10 08:48:45 2005
--- emacs/lisp/hilit-chg.el Fri Jun 10 14:03:52 2005
***************
*** 241,253 ****
'( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
;; defaults for dark background:
'("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
! "*Colours used by `highlight-changes-rotate-faces'.
The newest rotated change will be displayed in the first element of this list,
the next older will be in the second element etc.
This list is used if `highlight-changes-face-list' is nil, otherwise that
variable overrides this list. If you only care about foreground
! colours then use this, if you want fancier faces then set
`highlight-changes-face-list'."
:type '(repeat color)
:group 'highlight-changes)
--- 241,253 ----
'( "magenta" "blue" "darkgreen" "chocolate" "sienna4" "NavyBlue")
;; defaults for dark background:
'("yellow" "magenta" "blue" "maroon" "firebrick" "green4" "DarkOrchid"))
! "*Colors used by `highlight-changes-rotate-faces'.
The newest rotated change will be displayed in the first element of this list,
the next older will be in the second element etc.
This list is used if `highlight-changes-face-list' is nil, otherwise that
variable overrides this list. If you only care about foreground
! colors then use this, if you want fancier faces then set
`highlight-changes-face-list'."
:type '(repeat color)
:group 'highlight-changes)
***************
*** 383,389 ****
Normally the variable is initialized to nil and the list is created from
`highlight-changes-colours' when needed. However, you can set this variable
to any list of faces. You will have to do this if you want faces which
! don't just differ from the `highlight-changes' face by the foreground colour.
Otherwise, this list will be constructed when needed from
`highlight-changes-colours'."
:type '(choice
--- 383,389 ----
Normally the variable is initialized to nil and the list is created from
`highlight-changes-colours' when needed. However, you can set this variable
to any list of faces. You will have to do this if you want faces which
! don't just differ from the `highlight-changes' face by the foreground color.
Otherwise, this list will be constructed when needed from
`highlight-changes-colours'."
:type '(choice
***************
*** 778,784 ****
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 colours when the buffer is saved
by adding the following to `local-write-file-hooks', by evaling it in the
buffer to be saved):
--- 778,784 ----
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):
***************
*** 846,852 ****
(setq change-a (car change-info))
(setq change-b (car (cdr change-info)))
!
(hilit-chg-make-list)
(while change-a
(setq a-start (nth 0 (car change-a)))
--- 846,852 ----
(setq change-a (car change-info))
(setq change-b (car (cdr change-info)))
!
(hilit-chg-make-list)
(while change-a
(setq a-start (nth 0 (car change-a)))
***************
*** 890,900 ****
changes are made, so \\[highlight-changes-next-change] and
\\[highlight-changes-previous-change] will not work."
(interactive
! (list
(get-buffer (read-buffer "buffer-a " (current-buffer) t))
(get-buffer
(read-buffer "buffer-b "
! (window-buffer (next-window (selected-window))) t))))
(let ((file-a (buffer-file-name buf-a))
(file-b (buffer-file-name buf-b)))
(highlight-markup-buffers buf-a file-a buf-b file-b)
--- 890,900 ----
changes are made, so \\[highlight-changes-next-change] and
\\[highlight-changes-previous-change] will not work."
(interactive
! (list
(get-buffer (read-buffer "buffer-a " (current-buffer) t))
(get-buffer
(read-buffer "buffer-b "
! (window-buffer (next-window (selected-window))) t))))
(let ((file-a (buffer-file-name buf-a))
(file-b (buffer-file-name buf-b)))
(highlight-markup-buffers buf-a file-a buf-b file-b)
***************
*** 921,930 ****
nil ;; default
'yes ;; must exist
(let ((f (buffer-file-name (current-buffer))))
! (if f
(progn
(setq f (make-backup-file-name f))
! (or (file-exists-p f)
(setq f nil)))
)
f))))
--- 921,930 ----
nil ;; default
'yes ;; must exist
(let ((f (buffer-file-name (current-buffer))))
! (if f
(progn
(setq f (make-backup-file-name f))
! (or (file-exists-p f)
(setq f nil)))
)
f))))