From: Glenn Morris <rgm@gnu.org>
Date: Wed, 17 Jun 2015 00:04:35 +0000 (-0400)
Subject: Address some compilation warnings.
X-Git-Tag: emacs-25.0.90~1734
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55b41a82cdbb682a4657ddc47d194e5813cf262b;p=emacs.git

Address some compilation warnings.

* lisp/face-remap.el (text-scale-adjust):
* lisp/menu-bar.el (popup-menu-normalize-position):
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand):
* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-warn):
* lisp/emacs-lisp/generator.el (cps--transform-1):
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all):
* lisp/obsolete/vc-arch.el (vc-arch-mode-line-string):
* lisp/progmodes/octave.el (octave-goto-function-definition)
(octave-find-definition-default-filename):
Replace 't' with '_' in pcase.
---

diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 30147931adc..1a34fa78aef 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -292,7 +292,7 @@
               (format "Inlining closure %S failed" name))
              form))))
 
-      (t ;; Give up on inlining.
+      (_ ;; Give up on inlining.
        form))))
 
 ;; ((lambda ...) ...)
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index efd43898b60..baa08e754a1 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1417,7 +1417,7 @@ extra args."
                      (`(lambda ,args . ,_) args)
                      (`(closure ,_ ,args . ,_) args)
                      ((pred byte-code-function-p) (aref old 0))
-                     (t '(&rest def)))))
+                     (_ '(&rest def)))))
             (sig2 (byte-compile-arglist-signature arglist)))
         (unless (byte-compile-arglist-signatures-congruent-p sig1 sig2)
           (byte-compile-set-symbol-position name)
diff --git a/lisp/emacs-lisp/generator.el b/lisp/emacs-lisp/generator.el
index 08e1b7c27a9..123f64b9660 100644
--- a/lisp/emacs-lisp/generator.el
+++ b/lisp/emacs-lisp/generator.el
@@ -507,7 +507,7 @@ don't yield.")
         next-state)))
 
     ;; Process everything else by just evaluating the form normally.
-    (t (cps--make-atomic-state form next-state))))
+    (_ (cps--make-atomic-state form next-state))))
 
 (defun cps--make-catch-wrapper (tag-binding next-state)
   (lambda (form)
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 05ffa8d52cc..e9af3b08997 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -284,7 +284,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
                      (macroexp--expand-all newform)))
                (macroexp--expand-all newform))))))
 
-      (t form))))
+      (_ form))))
 
 ;;;###autoload
 (defun macroexpand-all (form &optional environment)
diff --git a/lisp/face-remap.el b/lisp/face-remap.el
index 93eec5bd13c..3a8aba566dc 100644
--- a/lisp/face-remap.el
+++ b/lisp/face-remap.el
@@ -330,7 +330,7 @@ a top-level keymap, `text-scale-increase' or
               ((or ?+ ?=) inc)
               (?- (- inc))
               (?0 0)
-              (t inc))))
+              (_ inc))))
       (text-scale-increase step)
       ;; (unless (zerop step)
       (message "Use +,-,0 for further adjustment")
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index a1b6d95ec0b..65ed8d5cc65 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2258,7 +2258,7 @@ If nil, the current mouse position is used."
     ;; Event.
     ((pred eventp)
      (popup-menu-normalize-position (event-end position)))
-    (t position)))
+    (_ position)))
 
 (defcustom tty-menu-open-use-tmm nil
   "If non-nil, \\[menu-bar-open] on a TTY will invoke `tmm-menubar'.
diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el
index 2469f761a91..8b2454b1ea6 100644
--- a/lisp/obsolete/vc-arch.el
+++ b/lisp/obsolete/vc-arch.el
@@ -397,7 +397,7 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see
 	    (pcase (vc-state file)
 	      ((or `up-to-date `needs-update) ?-)
 	      (`added ?@)
-	      (t ?:))
+	      (_ ?:))
 	    rev)))
 
 (defun vc-arch-diff3-rej-p (rej)
diff --git a/lisp/progmodes/octave.el b/lisp/progmodes/octave.el
index 8541cced3a5..50f888cb9fd 100644
--- a/lisp/progmodes/octave.el
+++ b/lisp/progmodes/octave.el
@@ -1064,7 +1064,7 @@ directory and makes this the current buffer's default directory."
     (pcase (and buffer-file-name (file-name-extension buffer-file-name))
       (`"cc" (funcall search
                       "\\_<DEFUN\\(?:_DLD\\)?\\s-*(\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)" 1))
-      (t (funcall search octave-function-header-regexp 3)))))
+      (_ (funcall search octave-function-header-regexp 3)))))
 
 (defun octave-function-file-p ()
   "Return non-nil if the first token is \"function\".
@@ -1820,7 +1820,7 @@ If the environment variable OCTAVE_SRCDIR is set, it is searched first."
                               (file-name-nondirectory name)))
          name
        (user-error "Aborted")))
-    (t name)))
+    (_ name)))
 
 (defvar find-tag-marker-ring)