From: Bastien <bzg@altern.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: 12345@debbugs.gnu.org
Subject: bug#12345: 24.2.50; doc string of `text-scale-adjust'
Date: Tue, 11 Sep 2012 19:36:56 +0200 [thread overview]
Message-ID: <87ipbkihqf.fsf@altern.org> (raw)
In-Reply-To: <jwvy5kghdtu.fsf-monnier+emacs@gnu.org> (Stefan Monnier's message of "Tue, 11 Sep 2012 09:48:26 -0400")
[-- Attachment #1: Type: text/plain, Size: 890 bytes --]
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> I enhanced the docstring and rewrote the command so that it does
>> not use a temporary keymap.
>
> Not using a temporary keymap means reverting to the old code: please
> explain precisely why using a temporary keymap is a problem (there are
> good reasons to use it: e.g. it makes key-translation-map and friends
> work correctly).
Here is another patch, using ̀set-temporary-overlay-map'.
It fixes the problem with the message disappearing.
It fixed another problem: the fact that in the current version,
INC is always 1 when using the command repeatedly, as we would
expect
C-u 4 C-x C-+ +
to increase by INC = 4 then again by INC = 4 again -- right now
it increase by INC = 4 on the first hit, then INC = 1 on the
second.
It also changes the behavior regarding C-x C-0, which ends
the loop.
Let me know what you think,
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: face-remap.el.2.patch --]
[-- Type: text/x-patch, Size: 2879 bytes --]
=== modified file 'lisp/face-remap.el'
--- lisp/face-remap.el 2012-07-10 11:51:54 +0000
+++ lisp/face-remap.el 2012-09-11 17:20:16 +0000
@@ -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,23 +323,16 @@
(?0 0)
(t inc))))
(text-scale-increase step)
- ;; FIXME: do it after every "iteration of the loop".
- (message "+,-,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))))
-
-\f
-;; ----------------------------------------------------------------
-;; buffer-face-mode
+ (unless (zerop step)
+ (message "Use + or - for further adjustment")
+ (set-temporary-overlay-map
+ (let ((map (make-sparse-keymap)))
+ (dolist (mods '(() (control)))
+ (dolist (key '(?- ?+ ?=))
+ (define-key map (vector (append mods (list key)))
+ `(lambda () (interactive) (text-scale-adjust (abs ,step))))))
+ map)
+ t)))))
(defcustom buffer-face-mode-face 'variable-pitch
"The face specification used by `buffer-face-mode'.
[-- Attachment #3: Type: text/plain, Size: 14 bytes --]
--
Bastien
next prev parent reply other threads:[~2012-09-11 17:36 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-04 2:54 bug#12345: 24.2.50; doc string of `text-scale-adjust' Drew Adams
2012-09-11 13:37 ` Bastien
2012-09-11 13:48 ` Stefan Monnier
2012-09-11 14:24 ` Bastien
2012-09-11 14:39 ` Drew Adams
2012-09-11 16:27 ` Bastien
2012-09-11 17:21 ` Stefan Monnier
2012-09-11 17:31 ` Bastien
2012-09-12 13:13 ` Stefan Monnier
2012-09-12 13:52 ` Bastien
2012-09-12 14:16 ` Drew Adams
2012-09-13 3:18 ` Stefan Monnier
2012-09-11 17:36 ` Bastien [this message]
2012-10-26 17:12 ` Stefan Monnier
2012-10-27 6:11 ` Bastien
2012-09-11 14:24 ` Drew Adams
2012-09-11 14:53 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87ipbkihqf.fsf@altern.org \
--to=bzg@altern.org \
--cc=12345@debbugs.gnu.org \
--cc=monnier@iro.umontreal.ca \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.