From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Thien-Thi Nguyen Newsgroups: gmane.emacs.devel Subject: Re: Release plans Date: Mon, 21 Jul 2008 10:06:56 +0200 Message-ID: <873am38xun.fsf@ambire.localdomain> References: <87r69wcxn7.fsf@stupidchicken.com> <87prp7vo3k.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1216627836 7845 80.91.229.12 (21 Jul 2008 08:10:36 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 21 Jul 2008 08:10:36 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jul 21 10:11:25 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KKqUN-0004hJ-Ij for ged-emacs-devel@m.gmane.org; Mon, 21 Jul 2008 10:11:23 +0200 Original-Received: from localhost ([127.0.0.1]:49872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KKqTU-0008Kg-DO for ged-emacs-devel@m.gmane.org; Mon, 21 Jul 2008 04:10:28 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KKqSt-00080h-VN for emacs-devel@gnu.org; Mon, 21 Jul 2008 04:09:52 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KKqSs-00080C-Hp for emacs-devel@gnu.org; Mon, 21 Jul 2008 04:09:51 -0400 Original-Received: from [199.232.76.173] (port=40507 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KKqSs-000802-9a for emacs-devel@gnu.org; Mon, 21 Jul 2008 04:09:50 -0400 Original-Received: from [151.61.143.244] (port=36616 helo=ambire.localdomain) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1KKqSr-0004Tw-IF for emacs-devel@gnu.org; Mon, 21 Jul 2008 04:09:50 -0400 Original-Received: from ttn by ambire.localdomain with local (Exim 4.63) (envelope-from ) id 1KKqQ4-0004jM-6S; Mon, 21 Jul 2008 10:06:56 +0200 In-Reply-To: <87prp7vo3k.fsf@stupidchicken.com> (Chong Yidong's message of "Mon, 21 Jul 2008 00:49:03 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:101058 Archived-At: () Chong Yidong () 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.