[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103664: * allout.el (allout-make-top
From: |
Ken Manheimer |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103664: * allout.el (allout-make-topic-prefix) (allout-rebullet-heading): Invert |
Date: |
Tue, 15 Mar 2011 17:01:37 -0400 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103664
committer: Ken Manheimer <address@hidden>
branch nick: trunk
timestamp: Tue 2011-03-15 17:01:37 -0400
message:
* allout.el (allout-make-topic-prefix) (allout-rebullet-heading): Invert
the roles of character and string values for INSTEAD, so a string is used
for the more common case of a defaulting prompt.
modified:
lisp/ChangeLog
lisp/allout.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-03-15 17:39:56 +0000
+++ b/lisp/ChangeLog 2011-03-15 21:01:37 +0000
@@ -1,3 +1,9 @@
+2011-03-15 Ken Manheimer <address@hidden>
+
+ * allout.el (allout-make-topic-prefix) (allout-rebullet-heading):
+ Invert the roles of character and string values for INSTEAD, so a
+ string is used for the more common case of a defaulting prompt.
+
2011-03-15 Stefan Monnier <address@hidden>
* progmodes/ruby-mode.el (ruby-backward-sexp):
=== modified file 'lisp/allout.el'
--- a/lisp/allout.el 2011-03-15 02:46:18 +0000
+++ b/lisp/allout.el 2011-03-15 21:01:37 +0000
@@ -3496,8 +3496,8 @@
If INSTEAD is:
- nil, then the bullet char for the context is used, per distinction or depth
-- a string, then the first character of the string will be used
-- a character, then the user is solicited for bullet, with that char as default
+- a \(numeric) character, then character's string representation is used
+- a string, then the user is asked for bullet with the first char as default
- anything else, the user is solicited with bullet char per context as default
\(INSTEAD overrides other options, including, eg, a distinctive
@@ -3554,10 +3554,12 @@
((progn (setq body (make-string (- depth 2) ?\ ))
;; The actual condition:
instead)
- (let* ((got
- (if (and (stringp instead)(> (length instead) 0))
- (substring instead 0 1)
- (allout-solicit-alternate-bullet depth instead))))
+ (let ((got (cond ((stringp instead)
+ (if (> (length instead) 0)
+ (allout-solicit-alternate-bullet
+ depth (substring instead 0 1))))
+ ((characterp instead) (char-to-string instead))
+ (t (allout-solicit-alternate-bullet depth)))))
;; Gotta check whether we're numbering and got a numbered bullet:
(setq numbering (and allout-numbered-bullet
(not (and number-control (not index)))
@@ -3951,8 +3953,8 @@
If INSTEAD is:
- nil, then the bullet char for the context is used, per distinction or depth
-- a string, then the first character of the string will be used
-- a character, then the user is solicited for bullet, with that char as default
+- a \(numeric) character, then character's string representation is used
+- a string, then the user is asked for bullet with the first char as default
- anything else, the user is solicited with bullet char per context as default
Second arg DEPTH forces the topic prefix to that depth, regardless
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103664: * allout.el (allout-make-topic-prefix) (allout-rebullet-heading): Invert,
Ken Manheimer <=