Mercurial > emacs
changeset 93721:6604d09cf521
*** empty log message ***
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sat, 05 Apr 2008 20:00:23 +0000 |
| parents | ca1c8545b135 |
| children | ac376173ee3d |
| files | lisp/ChangeLog lisp/subr.el |
| diffstat | 2 files changed, 16 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Apr 05 19:16:40 2008 +0000 +++ b/lisp/ChangeLog Sat Apr 05 20:00:23 2008 +0000 @@ -21,16 +21,16 @@ (calendar-coptic-name): Rename coptic-name. Update callers. (calendar-coptic-leap-year-p): Rename coptic-calendar-leap-year-p. Update callers. - (calendar-coptic-last-day-of-month): Rename - coptic-calendar-last-day-of-month. Update callers. + (calendar-coptic-last-day-of-month): + Rename coptic-calendar-last-day-of-month. Update callers. (calendar-coptic-to-absolute): Rename calendar-absolute-from-coptic. Keep old name as alias, update callers. (calendar-coptic-print-date): Rename calendar-print-coptic-date. Keep old name as alias, update callers. (calendar-coptic-goto-date): Rename calendar-goto-coptic-date. Keep old name as alias. - (calendar-ethiopic-month-name-array): Rename - ethiopic-calendar-month-name-array. Update callers. + (calendar-ethiopic-month-name-array): + Rename ethiopic-calendar-month-name-array. Update callers. (calendar-ethiopic-epoch): Rename ethiopic-calendar-epoch. Update callers. (calendar-ethiopic-name): Rename ethiopic-name. Update callers. @@ -41,24 +41,24 @@ (calendar-ethiopic-goto-date): Rename calendar-goto-ethiopic-date. Keep old name as alias. - * calendar/cal-french.el (calendar-french-epoch): Rename - french-calendar-epoch. Update callers. + * calendar/cal-french.el (calendar-french-epoch): + Rename french-calendar-epoch. Update callers. (calendar-french-month-name-array): Rename variable and function french-calendar-month-name-array. Update callers. - (calendar-french-multibyte-month-name-array): Rename - french-calendar-multibyte-month-name-array. Update callers. + (calendar-french-multibyte-month-name-array): + Rename french-calendar-multibyte-month-name-array. Update callers. (calendar-french-day-name-array): Rename variable and function french-calendar-day-name-array. Update callers. (calendar-french-special-days-array): Rename variable and function french-calendar-special-days-array. Update callers. - (calendar-french-multibyte-special-days-array): Rename - french-calendar-multibyte-special-days-array. Update callers. + (calendar-french-multibyte-special-days-array): + Rename french-calendar-multibyte-special-days-array. Update callers. (calendar-french-accents-p): Rename french-calendar-accents. Update callers. (calendar-french-leap-year-p): Rename french-calendar-leap-year-p. Update callers. - (calendar-french-last-day-of-month): Rename - french-calendar-last-day-of-month. Update callers. + (calendar-french-last-day-of-month): + Rename french-calendar-last-day-of-month. Update callers. (calendar-french-to-absolute): Rename calendar-absolute-from-french. Keep old name as alias, update callers. (calendar-french-print-date): Rename calendar-print-french-date. @@ -67,10 +67,12 @@ Keep old name as alias. * calendar/cal-menu.el, calendar/calendar.el: - Update for coptic and french name changes. + Update for Coptic and French name changes. 2008-04-05 Stefan Monnier <monnier@iro.umontreal.ca> + * subr.el (keymap-canonicalize): Correct thinko. + * server.el: Undo part of the multi-tty change, which is only needed if server.el is preloaded, and broke server-running-p. (server-socket-dir): Initialize in the defvar, as before.
--- a/lisp/subr.el Sat Apr 05 19:16:40 2008 +0000 +++ b/lisp/subr.el Sat Apr 05 20:00:23 2008 +0000 @@ -566,7 +566,7 @@ (keymap-prompt map))) (dolist (binding ranges) ;; Treat char-ranges specially. - (define-key map (car binding) (cdr binding))) + (define-key map (vector (car binding)) (cdr binding))) (dolist (binding (prog1 bindings (setq bindings ()))) (let* ((key (car binding)) (item (cdr binding))