From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Juri Linkov Newsgroups: gmane.emacs.bugs Subject: bug#9820: 24.0.90; Behaviour of add-file-local-variable Date: Tue, 18 Jun 2013 01:35:50 +0300 Organization: JURTA Message-ID: <87bo74pdq1.fsf@mail.jurta.org> References: <8162jjj5dp.fsf@gmail.com> <87ehy61n79.fsf@mail.jurta.org> <8139el1v3i.fsf@gmail.com> <81vcrhzid5.fsf@gmail.com> <87fwilkqck.fsf@mail.jurta.org> <87ip1fx8sw.fsf@mail.jurta.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1371508812 23663 80.91.229.3 (17 Jun 2013 22:40:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 17 Jun 2013 22:40:12 +0000 (UTC) Cc: Jambunathan K , 9820@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Jun 18 00:40:12 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 1Uoi5r-0000EM-PY for geb-bug-gnu-emacs@m.gmane.org; Tue, 18 Jun 2013 00:40:12 +0200 Original-Received: from localhost ([::1]:34071 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoi5p-0000Og-AR for geb-bug-gnu-emacs@m.gmane.org; Mon, 17 Jun 2013 18:40:09 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:33806) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoi5k-0000GJ-IG for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2013 18:40:06 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uoi5i-0008Qz-VY for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2013 18:40:04 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57258) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoi5i-0008QS-T7 for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2013 18:40:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1Uoi5i-0003YM-16 for bug-gnu-emacs@gnu.org; Mon, 17 Jun 2013 18:40:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Juri Linkov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 17 Jun 2013 22:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 9820 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 9820-submit@debbugs.gnu.org id=B9820.137150876013578 (code B ref 9820); Mon, 17 Jun 2013 22:40:01 +0000 Original-Received: (at 9820) by debbugs.gnu.org; 17 Jun 2013 22:39:20 +0000 Original-Received: from localhost ([127.0.0.1]:51574 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Uoi51-0003Wt-3J for submit@debbugs.gnu.org; Mon, 17 Jun 2013 18:39:19 -0400 Original-Received: from ps18281.dreamhost.com ([69.163.218.105]:34601 helo=ps18281.dreamhostps.com) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Uoi4x-0003Wh-Gd for 9820@debbugs.gnu.org; Mon, 17 Jun 2013 18:39:16 -0400 Original-Received: from localhost (ps18281.dreamhostps.com [69.163.218.105]) by ps18281.dreamhostps.com (Postfix) with ESMTP id 976AE258B9E915; Mon, 17 Jun 2013 15:39:13 -0700 (PDT) In-Reply-To: (Stefan Monnier's message of "Sat, 15 Jun 2013 20:50:15 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (x86_64-pc-linux-gnu) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.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:75271 Archived-At: > But please eliminate this code duplication. Code duplication is eliminated by adding a new function `modify-file-local-variable-message' that now also performs more checks to decide when to display the message: === modified file 'lisp/files-x.el' --- lisp/files-x.el 2013-06-15 22:44:38 +0000 +++ lisp/files-x.el 2013-06-17 22:34:33 +0000 @@ -115,7 +115,38 @@ (defun read-file-local-variable-mode () ((and (stringp mode) (fboundp (intern mode))) (intern mode)) (t mode)))) -(defun modify-file-local-variable (variable value op) +(defun modify-file-local-variable-message (variable value op) + (let* ((not-value (make-symbol "")) + (old-value (cond ((eq variable 'mode) + major-mode) + ((eq variable 'coding) + buffer-file-coding-system) + (t (if (and (symbolp variable) + (boundp variable)) + (symbol-value variable) + not-value)))) + (new-value (if (eq op 'delete) + (cond ((eq variable 'mode) + (default-value 'major-mode)) + ((eq variable 'coding) + (default-value 'buffer-file-coding-system)) + (t (if (and (symbolp variable) + (default-boundp variable)) + (default-value variable) + not-value))) + (cond ((eq variable 'mode) + (let ((string (format "%S" value))) + (if (string-match-p "-mode\\'" string) + value + (intern (concat string "-mode"))))) + (t value))))) + (when (or (eq old-value not-value) + (eq new-value not-value) + (not (equal old-value new-value))) + (message "%s" (substitute-command-keys + "For this change to take effect revisit file using \\[revert-buffer]"))))) + +(defun modify-file-local-variable (variable value op &optional interactive) "Modify file-local VARIABLE in Local Variables depending on operation OP. If OP is `add-or-replace' then delete all existing settings of @@ -198,10 +229,13 @@ (defun modify-file-local-variable (varia ((eq variable 'mode) (goto-char beg)) ((null replaced-pos) (goto-char end)) (replaced-pos (goto-char replaced-pos))) - (insert (format "%s%S: %S%s\n" prefix variable value suffix))))))) + (insert (format "%s%S: %S%s\n" prefix variable value suffix)))) + + (when interactive + (modify-file-local-variable-message variable value op))))) ;;;###autoload -(defun add-file-local-variable (variable value) +(defun add-file-local-variable (variable value &optional interactive) "Add file-local VARIABLE with its VALUE to the Local Variables list. This command deletes all existing settings of VARIABLE (except `mode' @@ -213,17 +247,17 @@ (defun add-file-local-variable (variable `Local Variables:' and the last line containing the string `End:'." (interactive (let ((variable (read-file-local-variable "Add file-local variable"))) - (list variable (read-file-local-variable-value variable)))) - (modify-file-local-variable variable value 'add-or-replace)) + (list variable (read-file-local-variable-value variable) t))) + (modify-file-local-variable variable value 'add-or-replace interactive)) ;;;###autoload -(defun delete-file-local-variable (variable) +(defun delete-file-local-variable (variable &optional interactive) "Delete all settings of file-local VARIABLE from the Local Variables list." (interactive - (list (read-file-local-variable "Delete file-local variable"))) - (modify-file-local-variable variable nil 'delete)) + (list (read-file-local-variable "Delete file-local variable") t)) + (modify-file-local-variable variable nil 'delete interactive)) -(defun modify-file-local-variable-prop-line (variable value op) +(defun modify-file-local-variable-prop-line (variable value op &optional interactive) "Modify file-local VARIABLE in the -*- line depending on operation OP. If OP is `add-or-replace' then delete all existing settings of @@ -337,10 +371,13 @@ (defun modify-file-local-variable-prop-l (insert ";")) (unless (eq (char-before) ?\s) (insert " ")) (insert (format "%S: %S;" variable value)) - (unless (eq (char-after) ?\s) (insert " ")))))))) + (unless (eq (char-after) ?\s) (insert " "))))) + + (when interactive + (modify-file-local-variable-message variable value op))))) ;;;###autoload -(defun add-file-local-variable-prop-line (variable value) +(defun add-file-local-variable-prop-line (variable value &optional interactive) "Add file-local VARIABLE with its VALUE to the -*- line. This command deletes all existing settings of VARIABLE (except `mode' @@ -355,15 +394,15 @@ (defun add-file-local-variable-prop-line then this function adds it." (interactive (let ((variable (read-file-local-variable "Add -*- file-local variable"))) - (list variable (read-file-local-variable-value variable)))) - (modify-file-local-variable-prop-line variable value 'add-or-replace)) + (list variable (read-file-local-variable-value variable) t))) + (modify-file-local-variable-prop-line variable value 'add-or-replace interactive)) ;;;###autoload -(defun delete-file-local-variable-prop-line (variable) +(defun delete-file-local-variable-prop-line (variable &optional interactive) "Delete all settings of file-local VARIABLE from the -*- line." (interactive - (list (read-file-local-variable "Delete -*- file-local variable"))) - (modify-file-local-variable-prop-line variable nil 'delete)) + (list (read-file-local-variable "Delete -*- file-local variable") t)) + (modify-file-local-variable-prop-line variable nil 'delete interactive)) (defvar auto-insert) ; from autoinsert.el