From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Leo Liu Newsgroups: gmane.emacs.bugs Subject: bug#14285: 24.3; New octave feature: octave-update-function-file-comment Date: Sat, 27 Apr 2013 21:35:57 +0800 Message-ID: References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1367069822 31695 80.91.229.3 (27 Apr 2013 13:37:02 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 27 Apr 2013 13:37:02 +0000 (UTC) Cc: John Eaton , Jordi =?UTF-8?Q?Guti=C3=A9rrez?= Hermoso , 14285@debbugs.gnu.org To: Stefan Monnier Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sat Apr 27 15:37:05 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 1UW5JJ-0004JY-Cp for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Apr 2013 15:37:05 +0200 Original-Received: from localhost ([::1]:50800 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW5JI-0003MK-Pv for geb-bug-gnu-emacs@m.gmane.org; Sat, 27 Apr 2013 09:37:04 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:60498) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW5JE-0003MC-96 for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2013 09:37:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UW5JC-0000lu-3Y for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2013 09:37:00 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:42191) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UW5JB-0000lk-VT for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2013 09:36:58 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1UW5JH-0007kd-Bc for bug-gnu-emacs@gnu.org; Sat, 27 Apr 2013 09:37:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Leo Liu Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 27 Apr 2013 13:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 14285 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 14285-submit@debbugs.gnu.org id=B14285.136706978629657 (code B ref 14285); Sat, 27 Apr 2013 13:37:02 +0000 Original-Received: (at 14285) by debbugs.gnu.org; 27 Apr 2013 13:36:26 +0000 Original-Received: from localhost ([127.0.0.1]:46300 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UW5Ic-0007i0-Uv for submit@debbugs.gnu.org; Sat, 27 Apr 2013 09:36:25 -0400 Original-Received: from mail-pa0-f53.google.com ([209.85.220.53]:65185) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1UW5IS-0007h7-35 for 14285@debbugs.gnu.org; Sat, 27 Apr 2013 09:36:17 -0400 Original-Received: by mail-pa0-f53.google.com with SMTP id kx1so39051pab.26 for <14285@debbugs.gnu.org>; Sat, 27 Apr 2013 06:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:references:face:date:in-reply-to :message-id:user-agent:mime-version:content-type; bh=Rxyiz5w6j0pfLeVuI40671PQALjN5luCQh13dV/6oZE=; b=SCJGKZfoozZRQg6Ol9gg1WKhyVzhJIizvRz57nwAcIC2zJrO2tpkw2lyh/Fp/DLtaP j7kEyl91OsHEgIaIMCLxIw6dGSnaEF+EwBFcY/hy45RBK5iembKM9tqAhq1CyUqRNLic E2zK8wv9zDzIxoYztS6yW+fOmWmtsZloMxkbxfRRwdwuW2La8r34p+61o9HHwyHRIXwM 2f8ZmZ4W1E3R/DvhGbFIss3aGkR9xgeZixcKAQPnWeO2+/DdOjOXm4BxD8JqSQWxzpOo xQaA9j6fG5pa1SBRbZusXo+F6LOSaB/RUAdNiIg9eObjno2ZWBOAbEoNpVZy8iP5K6Je VzPQ== X-Received: by 10.68.218.34 with SMTP id pd2mr63115584pbc.204.1367069764978; Sat, 27 Apr 2013 06:36:04 -0700 (PDT) Original-Received: from Zeuss-MacBook.local ([110.172.225.137]) by mx.google.com with ESMTPSA id v5sm4470814pbz.4.2013.04.27.06.36.01 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sat, 27 Apr 2013 06:36:04 -0700 (PDT) Face: iVBORw0KGgoAAAANSUhEUgAAACgAAAAoBAMAAAB+0KVeAAAAG1BMVEUAAAA9Cgm3Hx1WWFWA gn+WmJWsrqv4+vcCAwCRl2MkAAAAAXRSTlMAQObYZgAAAAFiS0dEAIgFHUgAAAAJcEhZcwAAAYoA AAGKATOXMFgAAAAHdElNRQfXAQwDNR+ZJmElAAABIklEQVQoz22SPW+DQAyGWUq65qasd9PNUSX4 AZHK2C1rJy5jpDS4IwRVup9dn7GNafpKIPPgzztXFSujqq1eM2n8h22oMkvxI/i9C97kRfMRUN55 dS3BrsAwBXUtMLAO4lryh8kTjOxKpQNniNxAgZOEe4bZwsDTFhKdqZRLNII4OQNHhEuq/RMkm6Cj TnnEA/fk0BorcYn5qA3oaeAxbaBOLrX+9G48NZ2Fzc2tzDM8Q+tMypEOqYHh8mAWaaK3U/cDMOT5 aMZMABgPXc7zPMs1A8DXO756GFJ/4fMEq47hTsAdn5avoxZ4ywl0c2w4Flu2Ybeyb3S+EqxX2DYA H8veJGEDTnHnrXvRaPyt+2kSfK6rfBZ2tUtfP/mR+pR6sX8BUZ/cDV7tvkoAAAAASUVORK5CYII= In-Reply-To: (Stefan Monnier's message of "Sat, 27 Apr 2013 09:19:30 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (OS X 10.8.3) 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:73772 Archived-At: Thank you, Stefan, for the comments. Patch updated. lisp/files.el | 3 +- lisp/progmodes/octave.el | 115 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 99 insertions(+), 19 deletions(-) diff --git a/lisp/files.el b/lisp/files.el index 80166961..3af27bde 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -4540,7 +4540,8 @@ (defun basic-save-buffer () (insert ?\n)))) ;; Support VC version backups. (vc-before-save) - (run-hooks 'before-save-hook) + ;; Don't let errors prevent saving the buffer. + (with-demoted-errors (run-hooks 'before-save-hook)) (or (run-hook-with-args-until-success 'write-contents-functions) (run-hook-with-args-until-success 'local-write-file-hooks) (run-hook-with-args-until-success 'write-file-functions) diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el index f8b9e4f6..ebdcb8b1 100644 --- a/lisp/progmodes/octave.el +++ b/lisp/progmodes/octave.el @@ -1010,25 +1010,103 @@ (defun octave-maybe-insert-continuation-string () (delete-horizontal-space) (insert (concat " " octave-continuation-string)))) +(defun octave-function-file-p () + "Return non-nil if the first token is \"function\". +The value is (START END NAME-START NAME-END) of the function." + (save-excursion + (goto-char (point-min)) + (when (equal (funcall smie-forward-token-function) "function") + (forward-word -1) + (let* ((start (point)) + (end (progn (forward-sexp 1) (point))) + (name (when (progn + (goto-char start) + (re-search-forward octave-function-header-regexp + end t)) + (list (match-beginning 3) (match-end 3))))) + (cons start (cons end name)))))) + +;; Like forward-comment but stop at non-comment blank +(defun octave-skip-comment-forward (limit) + (let ((ppss (syntax-ppss))) + (if (nth 4 ppss) + (goto-char (nth 8 ppss)) + (goto-char (or (comment-search-forward limit t) (point))))) + (while (and (< (point) limit) (looking-at-p "\\s<")) + (forward-comment 1))) + +;;; First non-copyright comment block +(defun octave-function-file-comment () + "Beginnning and end positions of the function file comment." + (save-excursion + (goto-char (point-min)) + (let ((bound (progn (forward-comment (point-max)) (point)))) + (goto-char (point-min)) + ;; Copyright block: octave/libinterp/parse-tree/lex.ll around line 1634 + (when (save-excursion + (comment-search-forward bound t) + (when (eq (char-after) ?\{) ; case of block comment + (forward-char 1)) + (skip-syntax-forward "-") + (let ((case-fold-search t)) + (looking-at-p "\\(?:copyright\\|author\\)\\_>"))) + (octave-skip-comment-forward bound)) + (let ((beg (comment-search-forward bound t))) + (when beg + (goto-char beg) + (octave-skip-comment-forward bound) + (list beg (point))))))) + (defun octave-sync-function-file-names () "Ensure function name agree with function file name. See Info node `(octave)Function Files'." (interactive) + (when buffer-file-name + (pcase-let ((`(,start ,_end ,name-start ,name-end) + (octave-function-file-p))) + (when (and start name-start) + (let ((func (buffer-substring name-start name-end)) + (file (file-name-sans-extension + (file-name-nondirectory buffer-file-name)))) + (save-excursion + (when (and (not (equal file func)) + (progn + (goto-char name-start) + (yes-or-no-p + "Function name different from file name. Fix? "))) + (delete-region name-start name-end) + (insert file)))))))) + +(defun octave-update-function-file-comment (beg end &optional no-query) + "Update function file comment between BEG and END." + (interactive + (progn + (barf-if-buffer-read-only) + (if (use-region-p) + (list (region-beginning) (region-end) current-prefix-arg) + (append (or (octave-function-file-comment) + (error "No function file comment found")) + (list current-prefix-arg))))) (save-excursion - (when (and buffer-file-name - (prog2 - (goto-char (point-min)) - (equal (funcall smie-forward-token-function) "function") - (forward-word -1))) - (let ((file (file-name-sans-extension - (file-name-nondirectory buffer-file-name))) - (func (and (re-search-forward octave-function-header-regexp nil t) - (match-string 3)))) - (when (and func - (not (equal file func)) - (yes-or-no-p - "Function name different from file name. Fix? ")) - (replace-match file nil nil nil 3)))))) + (let* ((bounds (or (octave-function-file-p) + (error "Not in a function file buffer"))) + (func (if (cddr bounds) + (apply #'buffer-substring (cddr bounds)) + (error "Function name not found"))) + (old-func (progn + (goto-char beg) + (when (and (re-search-forward "usage:\\|@deftypefn" end t) + (re-search-forward + "[=}]\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)\\s-*(" + (line-end-position) t)) + (match-string 1)))) + (old-func (read-string + (format (if old-func "From (default %s): " "From: ") + old-func) + nil nil old-func))) + (when (and func old-func (not (equal func old-func))) + (perform-replace old-func func + (not no-query) nil 'delimited nil nil beg end))))) ;;; Indentation @@ -1356,10 +1434,11 @@ (define-skeleton octave-insert-defun (t (concat vals " = "))) name args)) - \n "function " > str \n \n - octave-block-comment-start "usage: " str \n - octave-block-comment-start \n octave-block-comment-start - \n _ \n + \n octave-block-comment-start "usage: " str \n + octave-block-comment-start \n + octave-block-comment-start \n + "function " > str \n + _ \n "endfunction" > \n) ;;; Communication with the inferior Octave process -- 1.8.2