[Emacs-diffs] /srv/bzr/emacs/trunk r110679: * lisp/face-remap.el: Use lexical-binding.

[Stefan Monnier]

------------------------------------------------------------
revno: 110679
author: Bastien <address@hidden>
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Fri 2012-10-26 13:07:35 -0400
message:
  * lisp/face-remap.el: Use lexical-binding.
  (text-scale-adjust): Improve docstring.  Use itself for the temporary
  overlay-map bindings, so as to repeat the "Use..." message each time.
modified:
  lisp/ChangeLog
  lisp/face-remap.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-26 15:59:40 +0000
+++ b/lisp/ChangeLog    2012-10-26 17:07:35 +0000
@@ -1,3 +1,10 @@
+2012-10-26  Bastien  <address@hidden>
+            Stefan Monnier  <address@hidden>
+
+       * face-remap.el: Use lexical-binding.
+       (text-scale-adjust): Improve docstring.  Use itself for the temporary
+       overlay-map bindings, so as to repeat the "Use..." message each time.
+
 2012-10-26  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/macroexp.el (macroexp--expand-all):

=== modified file 'lisp/face-remap.el'
--- a/lisp/face-remap.el        2012-07-10 11:51:54 +0000
+++ b/lisp/face-remap.el        2012-10-26 17:07:35 +0000
@@ -1,4 +1,4 @@
-;;; face-remap.el --- Functions for managing `face-remapping-alist'
+;;; face-remap.el --- Functions for managing `face-remapping-alist'  -*- 
lexical-binding: t -*-
 ;;
 ;; Copyright (C) 2008-2012 Free Software Foundation, Inc.
 ;;
@@ -285,7 +285,9 @@
 ;;;###autoload (define-key ctl-x-map [(control ?0)] 'text-scale-adjust)
 ;;;###autoload
 (defun text-scale-adjust (inc)
-  "Increase or decrease the height of the default face in the current buffer.
+  "Adjust the height of the default face by INC.
+
+INC may be passed as a numeric prefix argument.
 
 The actual adjustment made depends on the final component of the
 key-binding used to invoke the command, with all modifiers removed:
@@ -294,9 +296,11 @@
    -      Decrease the default face height by one step
    0      Reset the default face height to the global default
 
-Then, continue to read input events and further adjust the face
-height as long as the input event read (with all modifiers removed)
-is one of the above.
+When adjusting with `+' or `-', continue to read input events and
+further adjust the face height as long as the input event read
+\(with all modifiers removed) is `+' or `-'.
+
+When adjusting with `0', immediately finish.
 
 Each step scales the height of the default face by the variable
 `text-scale-mode-step' (a negative number of steps decreases the
@@ -309,8 +313,7 @@
 a top-level keymap, `text-scale-increase' or
 `text-scale-decrease' may be more appropriate."
   (interactive "p")
-  (let ((first t)
-       (ev last-command-event)
+  (let ((ev last-command-event)
        (echo-keystrokes nil))
     (let* ((base (event-basic-type ev))
            (step
@@ -320,19 +323,15 @@
               (?0 0)
               (t inc))))
       (text-scale-increase step)
-      ;; FIXME: do it after every "iteration of the loop".
-      (message "+,-,0 for further adjustment: ")
+      ;; (unless (zerop step)
+      (message "Use +,-,0 for further adjustment")
       (set-temporary-overlay-map
        (let ((map (make-sparse-keymap)))
          (dolist (mods '(() (control)))
-           (define-key map (vector (append mods '(?-))) 'text-scale-decrease)
-           (define-key map (vector (append mods '(?+))) 'text-scale-increase)
-           ;; = is unshifted + on most keyboards.
-           (define-key map (vector (append mods '(?=))) 'text-scale-increase)
-           (define-key map (vector (append mods '(?0)))
-             (lambda () (interactive) (text-scale-increase 0))))
-         map)
-       t))))
+           (dolist (key '(?- ?+ ?= ?0)) ;; = is often unshifted +.
+             (define-key map (vector (append mods (list key)))
+               (lambda () (interactive) (text-scale-adjust (abs inc))))))
+         map))))) ;; )
 
 
 ;; ----------------------------------------------------------------