From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Xue Fuqiao Newsgroups: gmane.emacs.bugs Subject: bug#13801: [PATCH] Trivial fix for files.el Date: Sun, 24 Feb 2013 14:33:32 +0800 Organization: The Church of Emacs Message-ID: <20130224143332.f33f9e158da879bd206e83cc@gmail.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1361689966 14211 80.91.229.3 (24 Feb 2013 07:12:46 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 24 Feb 2013 07:12:46 +0000 (UTC) To: 13801@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Feb 24 08:13:08 2013 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1U9VlX-0002Yg-DW for geb-bug-gnu-emacs@m.gmane.org; Sun, 24 Feb 2013 08:12:55 +0100 Original-Received: from localhost ([::1]:45262 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9VlC-0000F6-Ok for geb-bug-gnu-emacs@m.gmane.org; Sun, 24 Feb 2013 02:12:34 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:44266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Vl9-0000Eu-OY for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:12:33 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9Vl8-0002RF-DV for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:12:31 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:41002) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Vl8-0002RB-AG for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:12:30 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1U9Vmb-0001zL-ST for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:14:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Xue Fuqiao Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 24 Feb 2013 07:14:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 13801 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.13616900287613 (code B ref -1); Sun, 24 Feb 2013 07:14:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 24 Feb 2013 07:13:48 +0000 Original-Received: from localhost ([127.0.0.1]:46465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U9VmN-0001yj-K8 for submit@debbugs.gnu.org; Sun, 24 Feb 2013 02:13:48 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:60988) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1U9VmK-0001yb-92 for submit@debbugs.gnu.org; Sun, 24 Feb 2013 02:13:45 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9Vko-0002Mj-Ic for submit@debbugs.gnu.org; Sun, 24 Feb 2013 02:12:12 -0500 Original-Received: from lists.gnu.org ([208.118.235.17]:54835) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Vko-0002MT-Ez for submit@debbugs.gnu.org; Sun, 24 Feb 2013 02:12:10 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:44106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9Vkm-0000Cy-E1 for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:12:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U9Vkk-0002LU-Fc for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 02:12:08 -0500 Original-Received: from mail-pa0-f47.google.com ([209.85.220.47]:39972) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U9V9o-00020c-OU for bug-gnu-emacs@gnu.org; Sun, 24 Feb 2013 01:33:56 -0500 Original-Received: by mail-pa0-f47.google.com with SMTP id bj3so1204655pad.20 for ; Sat, 23 Feb 2013 22:33:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:date:from:to:subject:message-id:organization:x-mailer :mime-version:content-type:content-transfer-encoding; bh=4lBYP4cSUYyP3GTFDPVwccIzfBphb24lwK/xBZxorI0=; b=E9uXAvmglsqY3iHNHNwrdH97MCujK2xqtIvmcX8BWVcD4FT9jwShQgI12boWoJl/jS RolQVRuFHTygpXa+/FDvdGO9H14/FNdPcL7Cd2hAkw8yRqsRdLC6bdC18GbmncfJ2kN9 iv57E8U2ma4xTdkQqr05Ft4p3ro6RUgj1ZhAkc2rFxni8QqYnHa0srK+larZ41S5OLGh 0mdfT9lGgypML5Eg2OfiVM9u7U1edImVy9rNXdxqjGMaWjhrCK5nFhLteiAZaAxrtpP6 wqRx084tF/g9kk23jOvYP75fiY+rIrXAGgUnI5VYAYo8Z7Qr8bmWL1VoA7oJWfeXDSQe hP7A== X-Received: by 10.68.227.9 with SMTP id rw9mr11754393pbc.185.1361687635934; Sat, 23 Feb 2013 22:33:55 -0800 (PST) Original-Received: from Emacs ([61.149.226.23]) by mx.google.com with ESMTPS id tp2sm8340328pbc.12.2013.02.23.22.33.45 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 23 Feb 2013 22:33:54 -0800 (PST) X-Mailer: Sylpheed 3.2.0 (GTK+ 2.24.13; x86_64-pc-linux-gnu) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:71741 Archived-At: I made a minor patch for files.el. The patch does this: 1. Improve the doc string for `break-hardlink-on-save'; 2. Remove an unnecessary `buffer-auto-save-file-name'. *** trunk/lisp/files.el 2013-02-24 06:49:38.358835000 +0800 --- trunk/lisp/files.el.new 2013-02-24 14:23:28.681175258 +0800 *************** See also: `break-hardlink-on-save'." *** 248,259 **** :group 'backup) (defcustom break-hardlink-on-save nil ! "Non-nil means when saving a file that exists under several names ! \(i.e., has multiple hardlinks), break the hardlink associated with ! `buffer-file-name' and write to a new file, so that the other ! instances of the file are not affected by the save. ! If `buffer-file-name' refers to a symlink, do not break the symlink. Unlike `file-precious-flag', `break-hardlink-on-save' is not advisory. For example, if the directory in which a file is being saved is not --- 248,262 ---- :group 'backup) (defcustom break-hardlink-on-save nil ! "This variable affect the relation between hardlink(s) and the file. ! Non-nil means when saving a file that exists under several names ! \(i.e., has multiple hardlinks), break the hardlink associated ! with the variable `buffer-file-name' and write to a new file, so ! that the other instances of the file are not affected by the ! save. ! If the variable`buffer-file-name' refers to a symlink, do not ! break the symlink. Unlike `file-precious-flag', `break-hardlink-on-save' is not advisory. For example, if the directory in which a file is being saved is not *************** non-nil, it is called instead of rereadi *** 5333,5339 **** (let* ((revert-buffer-in-progress-p t) (auto-save-p (and (not ignore-auto) (recent-auto-save-p) - buffer-auto-save-file-name (file-readable-p buffer-auto-save-file-name) (y-or-n-p "Buffer has been auto-saved recently. Revert from auto-save file? "))) --- 5336,5341 ---- *** trunk/lisp/ChangeLog 2013-02-24 06:49:38.358835000 +0800 --- trunk/lisp/ChangeLog.new 2013-02-24 14:27:41.126427073 +0800 *************** *** 1,7 **** 2013-02-23 Peter Kleiweg * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. ! (ps-mode-octal-region): Use string-make-unibyte. 2013-02-23 Glenn Morris --- 1,12 ---- + 2013-02-24 Xue Fuqiao + + * files.el (break-hardlink-on-save): Doc fix. + (revert-buffer): Remove the unnecessary `buffer-auto-save-file-name'. + 2013-02-23 Peter Kleiweg * progmodes/ps-mode.el (ps-mode-version): Bump to 1.1i. ! (ps-mode-octal-region): Use `string-make-unibyte'. 2013-02-23 Glenn Morris -- Best regards, Xue Fuqiao. http://www.emacswiki.org/emacs/XueFuqiao