auto upstream

3 files changed, 97 insertions, 64 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 163f2495849..abfd6153288 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,28 @@
+2013-04-29  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave.el (octave-font-lock-keywords): Handle 'end' in
+        indexing expression.
+        (octave-continuation-string): Do not use \.
+        (inferior-octave-complete-impossible): Remove.
+        (inferior-octave-completion-table)
+        (inferior-octave-completion-at-point): Remove its uses.
+        (inferior-octave-startup): completion_matches was introduced to
+        Octave in 1996 so safe to assume it.
+        (octave-function-file-comment): Improve to follow how Octave does it.
+        (octave-update-function-file-comment): Tweak.
+
+2013-04-29  Leo Liu  <sdl.web@gmail.com>
+
+        * progmodes/octave.el (inferior-octave-startup-hook): Obsolete.
+        (inferior-octave-startup): Remove inferior-octave-startup-hook.
+        (octave-function-file-comment): Fix typo.
+        (octave-sync-function-file-names): Use read-char-choice.
+
+2013-04-28  Jay Belanger  <jay.p.belanger@gmail.com>
+
+        * calc/calc.el (math-normalize): Don't set `math-normalize-error'
+        to t for the less important warnings.
+
 2013-04-27  Darren Hoo  <darren.hoo@gmail.com>  (tiny change)
 
         * isearch.el (isearch-fail-pos): Check for empty `cmds'.  (Bug#14268)
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index c35e7650254..bd5c9089bcc 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -2701,7 +2701,6 @@ largest Emacs integer.")
                                   (cons (car math-normalize-a) args))
                  nil)
                 (wrong-type-argument
-                 (setq math-normalize-error t)
                  (or calc-next-why
                      (calc-record-why "Wrong type of argument"
                                       (cons (car math-normalize-a) args)))
@@ -2712,7 +2711,6 @@ largest Emacs integer.")
                                   (cons (car math-normalize-a) args))
                  nil)
                 (inexact-result
-                 (setq math-normalize-error t)
                  (calc-record-why "No exact representation for result"
                                   (cons (car math-normalize-a) args))
                  nil)
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index b8fbe6a90a7..30b520b75a0 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -155,6 +155,17 @@ parenthetical grouping.")
                                      octave-text-functions))
                  "\\)\\_>")
          'font-lock-keyword-face)
+   ;; Note: 'end' also serves as the last index in an indexing expression.
+   ;; Ref: http://www.mathworks.com/help/matlab/ref/end.html
+   '("\\_<end\\_>" (0 (save-excursion
+                        (condition-case nil
+                            (progn
+                              (goto-char (match-beginning 0))
+                              (backward-up-list)
+                              (unless (eq (char-after) ?\()
+                                font-lock-keyword-face))
+                          (error font-lock-keyword-face)))
+                      t))
    ;; Fontify all builtin operators.
    (cons "\\(&\\||\\|<=\\|>=\\|==\\|<\\|>\\|!=\\|!\\)"
          (if (boundp 'font-lock-builtin-face)
@@ -321,15 +332,17 @@ newline or semicolon after an else or end keyword."
   "Extra indentation applied to Octave continuation lines."
   :type 'integer
   :group 'octave)
+
 (eval-and-compile
   (defconst octave-continuation-marker-regexp "\\\\\\|\\.\\.\\."))
+
 (defvar octave-continuation-regexp
   (concat "[^#%\n]*\\(" octave-continuation-marker-regexp
           "\\)\\s-*\\(\\s<.*\\)?$"))
-(defcustom octave-continuation-string "\\"
-  "Character string used for Octave continuation lines.  Normally \\."
-  :type 'string
-  :group 'octave)
+
+;; Char \ is considered a bad decision for continuing a line.
+(defconst octave-continuation-string "..."
+  "Character string used for Octave continuation lines.")
 
 (defvar octave-mode-imenu-generic-expression
   (list
@@ -641,10 +654,8 @@ the regular expression `comint-prompt-regexp', a buffer local variable."
 (defvar inferior-octave-output-string nil)
 (defvar inferior-octave-receive-in-progress nil)
 
-(defvar inferior-octave-startup-hook nil)
-
-(defvar inferior-octave-complete-impossible nil
-  "Non-nil means that `inferior-octave-complete' is impossible.")
+(define-obsolete-variable-alias 'inferior-octave-startup-hook
+  'inferior-octave-mode-hook "24.4")
 
 (defvar inferior-octave-has-built-in-variables nil
   "Non-nil means that Octave has built-in variables.")
@@ -777,28 +788,20 @@ startup file, `~/.emacs-octave'."
                    'identity inferior-octave-output-list "\n")
                   "\n"))
       inferior-octave-output-string))
-    ;; Next, we check whether Octave supports `completion_matches' ...
-    (inferior-octave-send-list-and-digest
-     (list "exist \"completion_matches\"\n"))
-    (setq inferior-octave-complete-impossible
-          (not (string-match "5$" (car inferior-octave-output-list))))
 
     ;; And finally, everything is back to normal.
     (set-process-filter proc 'inferior-octave-output-filter)
-    (run-hooks 'inferior-octave-startup-hook)
-    (run-hooks 'inferior-octave-startup-hook)
     ;; Just in case, to be sure a cd in the startup file
     ;; won't have detrimental effects.
     (inferior-octave-resync-dirs)))
 
 (defun inferior-octave-completion-table ()
-  (unless inferior-octave-complete-impossible
-    (completion-table-dynamic
-     (lambda (command)
-       (inferior-octave-send-list-and-digest
-        (list (concat "completion_matches (\"" command "\");\n")))
-       (sort (delete-dups inferior-octave-output-list)
-             'string-lessp)))))
+  (completion-table-dynamic
+   (lambda (command)
+     (inferior-octave-send-list-and-digest
+      (list (concat "completion_matches (\"" command "\");\n")))
+     (sort (delete-dups inferior-octave-output-list)
+           'string-lessp))))
 
 (defun inferior-octave-completion-at-point ()
   "Return the data to complete the Octave symbol at point."
@@ -807,13 +810,8 @@ startup file, `~/.emacs-octave'."
           (save-excursion
             (skip-syntax-backward "w_" (comint-line-beginning-position))
             (point))))
-    (cond ((eq start end) nil)
-          (inferior-octave-complete-impossible
-           (message (concat
-                     "Your Octave does not have `completion_matches'.  "
-                     "Please upgrade to version 2.X."))
-           nil)
-          (t (list start end (inferior-octave-completion-table))))))
+    (when (> end start)
+      (list start end (inferior-octave-completion-table)))))
 
 (define-obsolete-function-alias 'inferior-octave-complete
   'completion-at-point "24.1")
@@ -966,25 +964,23 @@ The value is (START END NAME-START NAME-END) of the function."
 
 ;;; First non-copyright comment block
 (defun octave-function-file-comment ()
-  "Beginnning and end positions of the function file comment."
+  "Beginning 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)))))))
+    ;; Copyright block: octave/libinterp/parse-tree/lex.ll around line 1634
+    (while (save-excursion
+             (when (comment-search-forward (point-max) 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 (point-max)))
+    (let ((beg (comment-search-forward (point-max) t)))
+      (when beg
+        (goto-char beg)
+        (octave-skip-comment-forward (point-max))
+        (list beg (point))))))
 
 (defun octave-sync-function-file-names ()
   "Ensure function name agree with function file name.
@@ -994,17 +990,32 @@ See Info node `(octave)Function Files'."
     (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))))))))
+        (let* ((func (buffer-substring name-start name-end))
+               (file (file-name-sans-extension
+                      (file-name-nondirectory buffer-file-name)))
+               (help-form (format "\
+a: Use function name `%s'
+b: Use file name `%s'
+q: Don't fix\n" func file))
+               (c (unless (equal file func)
+                    (save-window-excursion
+                      (help-form-show)
+                      (read-char-choice
+                       "Which name to use? (a/b/q) " '(?a ?b ?q))))))
+          (pcase c
+            (`?a (let ((newname (expand-file-name
+                                 (concat func (file-name-extension
+                                               buffer-file-name t)))))
+                   (when (or (not (file-exists-p newname))
+                             (yes-or-no-p
+                              (format "Target file %s exists; proceed? " newname)))
+                     (when (file-exists-p buffer-file-name)
+                       (rename-file buffer-file-name newname t))
+                     (set-visited-file-name newname))))
+            (`?b (save-excursion
+                   (goto-char name-start)
+                   (delete-region name-start name-end)
+                   (insert file)))))))))
 
 (defun octave-update-function-file-comment (beg end)
   "Query replace function names in function file comment."
@@ -1023,11 +1034,10 @@ See Info node `(octave)Function Files'."
                    (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_\\)+\\)\\_>"
-                                   (line-end-position) t))
+                       (when (re-search-forward
+                              "[=}]\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)\\_>"
+                              (min (line-end-position 4) end)
+                              t)
                          (match-string 1))))
            (old-func (read-string (format (if old-func
                                               "Name to replace (default %s): "