aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2015-06-16 20:04:35 -0400
committerGlenn Morris2015-06-16 20:04:35 -0400
commit55b41a82cdbb682a4657ddc47d194e5813cf262b (patch)
treebefb15c0a376e843765274c2e275c96244f5f2ed
parentcf94a3e0c4320f74c1de8c9a887b1ed8e74163d3 (diff)
downloademacs-55b41a82cdbb682a4657ddc47d194e5813cf262b.tar.gz
emacs-55b41a82cdbb682a4657ddc47d194e5813cf262b.zip
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.
-rw-r--r--lisp/emacs-lisp/byte-opt.el2
-rw-r--r--lisp/emacs-lisp/bytecomp.el2
-rw-r--r--lisp/emacs-lisp/generator.el2
-rw-r--r--lisp/emacs-lisp/macroexp.el2
-rw-r--r--lisp/face-remap.el2
-rw-r--r--lisp/menu-bar.el2
-rw-r--r--lisp/obsolete/vc-arch.el2
-rw-r--r--lisp/progmodes/octave.el4
8 files changed, 9 insertions, 9 deletions
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 @@
292 (format "Inlining closure %S failed" name)) 292 (format "Inlining closure %S failed" name))
293 form)))) 293 form))))
294 294
295 (t ;; Give up on inlining. 295 (_ ;; Give up on inlining.
296 form)))) 296 form))))
297 297
298;; ((lambda ...) ...) 298;; ((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."
1417 (`(lambda ,args . ,_) args) 1417 (`(lambda ,args . ,_) args)
1418 (`(closure ,_ ,args . ,_) args) 1418 (`(closure ,_ ,args . ,_) args)
1419 ((pred byte-code-function-p) (aref old 0)) 1419 ((pred byte-code-function-p) (aref old 0))
1420 (t '(&rest def))))) 1420 (_ '(&rest def)))))
1421 (sig2 (byte-compile-arglist-signature arglist))) 1421 (sig2 (byte-compile-arglist-signature arglist)))
1422 (unless (byte-compile-arglist-signatures-congruent-p sig1 sig2) 1422 (unless (byte-compile-arglist-signatures-congruent-p sig1 sig2)
1423 (byte-compile-set-symbol-position name) 1423 (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.")
507 next-state))) 507 next-state)))
508 508
509 ;; Process everything else by just evaluating the form normally. 509 ;; Process everything else by just evaluating the form normally.
510 (t (cps--make-atomic-state form next-state)))) 510 (_ (cps--make-atomic-state form next-state))))
511 511
512(defun cps--make-catch-wrapper (tag-binding next-state) 512(defun cps--make-catch-wrapper (tag-binding next-state)
513 (lambda (form) 513 (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'."
284 (macroexp--expand-all newform))) 284 (macroexp--expand-all newform)))
285 (macroexp--expand-all newform)))))) 285 (macroexp--expand-all newform))))))
286 286
287 (t form)))) 287 (_ form))))
288 288
289;;;###autoload 289;;;###autoload
290(defun macroexpand-all (form &optional environment) 290(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
330 ((or ?+ ?=) inc) 330 ((or ?+ ?=) inc)
331 (?- (- inc)) 331 (?- (- inc))
332 (?0 0) 332 (?0 0)
333 (t inc)))) 333 (_ inc))))
334 (text-scale-increase step) 334 (text-scale-increase step)
335 ;; (unless (zerop step) 335 ;; (unless (zerop step)
336 (message "Use +,-,0 for further adjustment") 336 (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."
2258 ;; Event. 2258 ;; Event.
2259 ((pred eventp) 2259 ((pred eventp)
2260 (popup-menu-normalize-position (event-end position))) 2260 (popup-menu-normalize-position (event-end position)))
2261 (t position))) 2261 (_ position)))
2262 2262
2263(defcustom tty-menu-open-use-tmm nil 2263(defcustom tty-menu-open-use-tmm nil
2264 "If non-nil, \\[menu-bar-open] on a TTY will invoke `tmm-menubar'. 2264 "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
397 (pcase (vc-state file) 397 (pcase (vc-state file)
398 ((or `up-to-date `needs-update) ?-) 398 ((or `up-to-date `needs-update) ?-)
399 (`added ?@) 399 (`added ?@)
400 (t ?:)) 400 (_ ?:))
401 rev))) 401 rev)))
402 402
403(defun vc-arch-diff3-rej-p (rej) 403(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."
1064 (pcase (and buffer-file-name (file-name-extension buffer-file-name)) 1064 (pcase (and buffer-file-name (file-name-extension buffer-file-name))
1065 (`"cc" (funcall search 1065 (`"cc" (funcall search
1066 "\\_<DEFUN\\(?:_DLD\\)?\\s-*(\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)" 1)) 1066 "\\_<DEFUN\\(?:_DLD\\)?\\s-*(\\s-*\\(\\(?:\\sw\\|\\s_\\)+\\)" 1))
1067 (t (funcall search octave-function-header-regexp 3))))) 1067 (_ (funcall search octave-function-header-regexp 3)))))
1068 1068
1069(defun octave-function-file-p () 1069(defun octave-function-file-p ()
1070 "Return non-nil if the first token is \"function\". 1070 "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."
1820 (file-name-nondirectory name))) 1820 (file-name-nondirectory name)))
1821 name 1821 name
1822 (user-error "Aborted"))) 1822 (user-error "Aborted")))
1823 (t name))) 1823 (_ name)))
1824 1824
1825(defvar find-tag-marker-ring) 1825(defvar find-tag-marker-ring)
1826 1826