[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Release plans
From: |
Thien-Thi Nguyen |
Subject: |
Re: Release plans |
Date: |
Mon, 21 Jul 2008 10:06:56 +0200 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
() Chong Yidong <address@hidden>
() Mon, 21 Jul 2008 00:49:03 -0400
now would be a good time to ping
Ping! (I can't remember if this was accepted or not.)
thi
_______________________________________________
*** lisp/smerge-mode.el.~1.72~ 2008-07-21 09:58:34.000000000 +0200
--- lisp/smerge-mode.el 2008-06-24 09:17:57.000000000 +0200
***************
*** 44,50 ****
;;; Code:
! (eval-when-compile (require 'cl))
;;; The real definition comes later.
--- 44,50 ----
;;; Code:
! (eval-when-compile (require 'cl) (require 'diff-mode))
;;; The real definition comes later.
***************
*** 77,87 ****
:group 'smerge
:type 'boolean)
- (defcustom smerge-auto-refine t
- "Automatically highlight changes in detail as the user visits conflicts."
- :group 'smerge
- :type 'boolean)
-
(defface smerge-mine
'((((min-colors 88) (background light))
(:foreground "blue1"))
--- 77,82 ----
***************
*** 259,265 ****
;; Define smerge-next and smerge-prev
(easy-mmode-define-navigation smerge smerge-begin-re "conflict" nil nil
! (if smerge-auto-refine
(condition-case nil (smerge-refine) (error nil))))
(defconst smerge-match-names ["conflict" "mine" "base" "other"])
--- 254,260 ----
;; Define smerge-next and smerge-prev
(easy-mmode-define-navigation smerge smerge-begin-re "conflict" nil nil
! (if diff-auto-refine-mode
(condition-case nil (smerge-refine) (error nil))))
(defconst smerge-match-names ["conflict" "mine" "base" "other"])
*** lisp/diff-mode.el.~1.145~ 2008-07-21 09:56:54.000000000 +0200
--- lisp/diff-mode.el 2008-07-21 10:02:30.000000000 +0200
***************
*** 91,101 ****
:type 'boolean
:group 'diff-mode)
- (defcustom diff-auto-refine t
- "Automatically highlight changes in detail as the user visits hunks."
- :type 'boolean
- :group 'diff-mode)
-
(defcustom diff-mode-hook nil
"Run after setting up the `diff-mode' major mode."
:type 'hook
--- 91,96 ----
***************
*** 220,225 ****
--- 215,227 ----
`((,diff-minor-mode-prefix . ,diff-mode-shared-map))
"Keymap for `diff-minor-mode'. See also `diff-mode-shared-map'.")
+ (define-minor-mode diff-auto-refine-mode
+ "Automatically highlight changes in detail as the user visits hunks.
+ When transitioning from disabled to enabled,
+ try to refine the current hunk, as well."
+ :group 'diff-mode :init-value t :lighter " Auto-Refine"
+ (when diff-auto-refine-mode
+ (condition-case-no-debug nil (diff-refine-hunk) (error nil))))
;;;;
;;;; font-lock support
***************
*** 528,534 ****
;; Define diff-{hunk,file}-{prev,next}
(easy-mmode-define-navigation
diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
! (if diff-auto-refine
(condition-case-no-debug nil (diff-refine-hunk) (error nil))))
(easy-mmode-define-navigation
--- 530,536 ----
;; Define diff-{hunk,file}-{prev,next}
(easy-mmode-define-navigation
diff-hunk diff-hunk-header-re "hunk" diff-end-of-hunk diff-restrict-view
! (if diff-auto-refine-mode
(condition-case-no-debug nil (diff-refine-hunk) (error nil))))
(easy-mmode-define-navigation
*** etc/NEWS.~1.1798.~ 2008-07-21 08:45:56.000000000 +0200
--- etc/NEWS 2008-07-21 10:03:32.000000000 +0200
***************
*** 579,585 ****
*** diff-refine-hunk highlights word-level details of changes in a diff hunk.
It's used automatically as you move through hunks, see
! diff-auto-refine. It is bound to `C-c C-b'.
*** diff-add-change-log-entries-other-window iterates through the diff
buffer and tries to create ChangeLog entries for each change.
--- 579,585 ----
*** diff-refine-hunk highlights word-level details of changes in a diff hunk.
It's used automatically as you move through hunks, see
! diff-auto-refine-mode. It is bound to `C-c C-b'.
*** diff-add-change-log-entries-other-window iterates through the diff
buffer and tries to create ChangeLog entries for each change.
***************
*** 784,790 ****
*** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag
pairs.
*** smerge-refine highlights word-level details of changes in conflict.
! It's used automatically as you move through conflicts, see smerge-auto-refine.
*** talk.el has been extended for multiple tty support.
--- 784,791 ----
*** sgml-electric-tag-pair-mode lets you simultaneously edit matched tag
pairs.
*** smerge-refine highlights word-level details of changes in conflict.
! It's used automatically as you move through conflicts, see
! smerge-auto-refine-mode.
*** talk.el has been extended for multiple tty support.