[Emacs-diffs] trunk r115300: Make the `interactive-only' bytecomp warning like the `obsolete' one

[Glenn Morris]

------------------------------------------------------------
revno: 115300
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2013-11-30 00:42:28 -0800
message:
  Make the `interactive-only' bytecomp warning like the `obsolete' one
  
  * emacs-lisp/bytecomp.el (byte-compile-form):
  Make the `interactive-only' warning like the `obsolete' one.
  
  * comint.el (comint-run):
  * files.el (insert-file-literally, insert-file):
  * replace.el (replace-string, replace-regexp):
  * simple.el (beginning-of-buffer, end-of-buffer, delete-backward-char)
  (goto-line, insert-buffer, next-line, previous-line):
  Tweak `interactive-only' spec.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/comint.el                 comint.el-20091113204419-o5vbwnq5f7feedwu-149
  lisp/emacs-lisp/bytecomp.el    bytecomp.el-20091113204419-o5vbwnq5f7feedwu-492
  lisp/files.el                  files.el-20091113204419-o5vbwnq5f7feedwu-265
  lisp/replace.el                replace.el-20091113204419-o5vbwnq5f7feedwu-119
  lisp/simple.el                 simple.el-20091113204419-o5vbwnq5f7feedwu-403

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-30 02:06:34 +0000
+++ b/lisp/ChangeLog    2013-11-30 08:42:28 +0000
@@ -1,5 +1,14 @@
 2013-11-30  Glenn Morris  <address@hidden>
 
+       * emacs-lisp/bytecomp.el (byte-compile-form):
+       Make the `interactive-only' warning like the `obsolete' one.
+       * comint.el (comint-run):
+       * files.el (insert-file-literally, insert-file):
+       * replace.el (replace-string, replace-regexp):
+       * simple.el (beginning-of-buffer, end-of-buffer, delete-backward-char)
+       (goto-line, insert-buffer, next-line, previous-line):
+       Tweak `interactive-only' spec.
+
        Stop keeping (most) generated cedet grammar files in the repository.
        * Makefile.in (semantic): New.
        (compile-main): Depend on semantic.

=== modified file 'lisp/comint.el'
--- a/lisp/comint.el    2013-11-25 17:16:32 +0000
+++ b/lisp/comint.el    2013-11-30 08:42:28 +0000
@@ -752,7 +752,7 @@
   (let ((name (file-name-nondirectory program)))
     (switch-to-buffer (make-comint name program))
     (run-hooks (intern-soft (concat "comint-" name "-hook")))))
-(put 'comint-run 'interactive-only "Use `make-comint' instead")
+(put 'comint-run 'interactive-only 'make-comint)
 
 (defun comint-exec (buffer name command startfile switches)
   "Start up a process named NAME in buffer BUFFER for Comint modes.

=== modified file 'lisp/emacs-lisp/bytecomp.el'
--- a/lisp/emacs-lisp/bytecomp.el       2013-11-25 18:45:34 +0000
+++ b/lisp/emacs-lisp/bytecomp.el       2013-11-30 08:42:28 +0000
@@ -2930,18 +2930,22 @@
      ((symbolp (car form))
       (let* ((fn (car form))
              (handler (get fn 'byte-compile))
-            (interactive-only (or (get fn 'interactive-only)
-                                  (memq fn 
byte-compile-interactive-only-functions))))
+            (interactive-only
+             (or (get fn 'interactive-only)
+                 (memq fn byte-compile-interactive-only-functions))))
         (when (macroexp--const-symbol-p fn)
           (byte-compile-warn "`%s' called as a function" fn))
        (when (and (byte-compile-warning-enabled-p 'interactive-only)
                   interactive-only)
-         (byte-compile-warn "`%s' used from Lisp code\n\
-That command is designed for interactive use only.\n%s"
-                             fn
-                            (if (stringp interactive-only)
-                                interactive-only
-                              "Consult the documentation for an alternative")))
+         (byte-compile-warn "`%s' is for interactive use only%s"
+                            fn
+                            (cond ((stringp interactive-only)
+                                   (format "; %s" interactive-only))
+                                  ((and (symbolp 'interactive-only)
+                                        (not (eq interactive-only t)))
+                                   (format "; use `%s' instead."
+                                           interactive-only))
+                                  (t "."))))
         (if (and (fboundp (car form))
                  (eq (car-safe (symbol-function (car form))) 'macro))
             (byte-compile-log-warning

=== modified file 'lisp/files.el'
--- a/lisp/files.el     2013-11-25 17:16:32 +0000
+++ b/lisp/files.el     2013-11-30 08:42:28 +0000
@@ -2085,8 +2085,7 @@
 \(Its calling sequence is different; see its documentation)."
   (interactive "*fInsert file literally: ")
   (insert-file-1 filename #'insert-file-contents-literally))
-(put 'insert-file-literally 'interactive-only
-     "Use `insert-file-contents-literally' instead")
+(put 'insert-file-literally 'interactive-only 'insert-file-contents-literally)
 
 (defvar find-file-literally nil
   "Non-nil if this buffer was made by `find-file-literally' or equivalent.
@@ -5009,7 +5008,7 @@
 \(Its calling sequence is different; see its documentation)."
   (interactive "*fInsert file: ")
   (insert-file-1 filename #'insert-file-contents))
-(put 'insert-file 'interactive-only "Use `insert-file-contents' instead.")
+(put 'insert-file 'interactive-only 'insert-file-contents)
 
 (defun append-to-file (start end filename)
   "Append the contents of the region to the end of file FILENAME.

=== modified file 'lisp/replace.el'
--- a/lisp/replace.el   2013-11-25 17:16:32 +0000
+++ b/lisp/replace.el   2013-11-30 08:42:28 +0000
@@ -524,7 +524,7 @@
               (region-end)))))
   (perform-replace from-string to-string nil nil delimited nil nil start end))
 (put 'replace-string 'interactive-only
-     "Use `search-forward' and `replace-match' instead.")
+     "use `search-forward' and `replace-match' instead.")
 
 (defun replace-regexp (regexp to-string &optional delimited start end)
   "Replace things after point matching REGEXP with TO-STRING.
@@ -593,7 +593,7 @@
               (region-end)))))
   (perform-replace regexp to-string nil t delimited nil nil start end))
 (put 'replace-regexp 'interactive-only
-     "Use `re-search-forward' and `replace-match' instead.")
+     "use `re-search-forward' and `replace-match' instead.")
 
 
 (defvar regexp-history nil

=== modified file 'lisp/simple.el'
--- a/lisp/simple.el    2013-11-25 17:16:32 +0000
+++ b/lisp/simple.el    2013-11-30 08:42:28 +0000
@@ -888,7 +888,8 @@
                        (/ (+ 10 (* size (prefix-numeric-value arg))) 10)))
                 (point-min))))
   (if (and arg (not (consp arg))) (forward-line 1)))
-(put 'beginning-of-buffer 'interactive-only "Use (goto-char (point-min)) 
instead")
+(put 'beginning-of-buffer 'interactive-only
+     "use `(goto-char (point-min))' instead.")
 
 (defun end-of-buffer (&optional arg)
   "Move point to the end of the buffer.
@@ -921,7 +922,7 @@
         ;; then scroll specially to put it near, but not at, the bottom.
         (overlay-recenter (point))
         (recenter -3))))
-(put 'end-of-buffer 'interactive-only "Use (goto-char (point-max)) instead")
+(put 'end-of-buffer 'interactive-only "use `(goto-char (point-max))' instead.")
 
 (defcustom delete-active-region t
   "Whether single-char deletion commands delete an active region.
@@ -984,7 +985,7 @@
             (insert-char ?\s (- ocol (current-column)) nil))))
        ;; Otherwise, do simple deletion.
        (t (delete-char (- n) killflag))))
-(put 'delete-backward-char 'interactive-only "Use `delete-char' instead")
+(put 'delete-backward-char 'interactive-only 'delete-char)
 
 (defun delete-forward-char (n &optional killflag)
   "Delete the following N characters (previous if N is negative).
@@ -1082,7 +1083,7 @@
     (if (eq selective-display t)
        (re-search-forward "[\n\C-m]" nil 'end (1- line))
       (forward-line (1- line)))))
-(put 'goto-line 'interactive-only "Use `forward-line' instead")
+(put 'goto-line 'interactive-only 'forward-line)
 
 (defun count-words-region (start end &optional arg)
   "Count the number of words in the region.
@@ -4169,7 +4170,7 @@
      (insert-buffer-substring (get-buffer buffer))
      (point)))
   nil)
-(put 'insert-buffer 'interactive-only "Use `insert-buffer-substring' instead")
+(put 'insert-buffer 'interactive-only 'insert-buffer-substring)
 
 (defun append-to-buffer (buffer start end)
   "Append to specified buffer the text of the region.
@@ -4768,7 +4769,7 @@
           (signal (car err) (cdr err))))
       (line-move arg nil nil try-vscroll)))
   nil)
-(put 'next-line 'interactive-only "Use `forward-line' instead")
+(put 'next-line 'interactive-only 'forward-line)
 
 (defun previous-line (&optional arg try-vscroll)
   "Move cursor vertically up ARG lines.
@@ -4809,7 +4810,7 @@
     (line-move (- arg) nil nil try-vscroll))
   nil)
 (put 'previous-line 'interactive-only
-     "Use `forward-line' with negative argument instead")
+     "use `forward-line' with negative argument instead.")
 
 (defcustom track-eol nil
   "Non-nil means vertical motion starting at end of line keeps to ends of 
lines.