diff options
| author | Daniel Hackney <dan@haxney.org> | 2013-09-04 23:30:07 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-09-04 23:30:07 -0400 |
| commit | 6c42fc3efbbf590fca00b866859fbfa13d34b70a (patch) | |
| tree | 0519b227a10215d99c1bc1373130c993ff93c623 /lisp/vc/ediff-wind.el | |
| parent | 4c528aabaa750d9a4e739dde482b307b734dcd62 (diff) | |
| download | emacs-6c42fc3efbbf590fca00b866859fbfa13d34b70a.tar.gz | |
* lisp/dired-x.el:
* lisp/net/ange-ftp.el:
* lisp/net/browse-url.el:
* lisp/net/dbus.el:
* lisp/net/eudc.el:
* lisp/net/eudcb-ldap.el:
* lisp/net/eww.el:
* lisp/net/imap.el:
* lisp/printing.el:
* lisp/vc/ediff-diff.el:
* lisp/vc/ediff-init.el:
* lisp/vc/ediff-merg.el:
* lisp/vc/ediff-mult.el:
* lisp/vc/ediff-util.el:
* lisp/vc/ediff-wind.el:
* lisp/vc/ediff.el:
* lisp/vc/emerge.el:
* lisp/vc/pcvs.el:
* vc/vc-annotate.el: Prefix unused arguments with `_' to silence
byte compiler. Remove some unused let-bound variables.
Diffstat (limited to 'lisp/vc/ediff-wind.el')
| -rw-r--r-- | lisp/vc/ediff-wind.el | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/vc/ediff-wind.el b/lisp/vc/ediff-wind.el index 5a14c193344..785535b82df 100644 --- a/lisp/vc/ediff-wind.el +++ b/lisp/vc/ediff-wind.el @@ -40,7 +40,7 @@ ;; declare-function does not exist in XEmacs (eval-and-compile - (unless (fboundp 'declare-function) (defmacro declare-function (&rest r)))) + (unless (fboundp 'declare-function) (defmacro declare-function (&rest _r)))) (require 'ediff-init) (require 'ediff-help) @@ -280,7 +280,7 @@ into icons, regardless of the window manager." ;;; Functions -(defun ediff-get-window-by-clicking (wind prev-wind wind-number) +(defun ediff-get-window-by-clicking (_wind _prev-wind wind-number) (let (event) (message "Select windows by clicking. Please click on Window %d " wind-number) @@ -289,9 +289,9 @@ into icons, regardless of the window manager." (beep 1)) (message "Please click on Window %d " wind-number)) (ediff-read-event) ; discard event - (setq wind (if (featurep 'xemacs) - (event-window event) - (posn-window (event-start event)))))) + (if (featurep 'xemacs) + (event-window event) + (posn-window (event-start event))))) ;; Select the lowest window on the frame. |