Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-22 22:33:05 +01:00
commit b6a1584fa6
2 changed files with 1 additions and 4 deletions

View file

@ -4141,7 +4141,7 @@ to execute outside of tables."
'(arg)
(concat "In tables, run `" (symbol-name fun) "'.\n"
"Outside of tables, run the binding of `"
(mapconcat (lambda (x) (format "%s" x)) keys "' or `")
(mapconcat #'key-description keys "' or `")
"'.")
'(interactive "p")
(list 'if

View file

@ -19590,9 +19590,6 @@ because, in this case the deletion might narrow the column."
(put 'org-self-insert-command 'pabbrev-expand-after-command t)
(put 'orgtbl-self-insert-command 'pabbrev-expand-after-command t)
;; How to do this: Measure non-white length of current string
;; If equal to column width, we should realign.
(defun org-remap (map &rest commands)
"In MAP, remap the functions given in COMMANDS.
COMMANDS is a list of alternating OLDDEF NEWDEF command names."