Commit 2a64315a authored by Stefan Monnier's avatar Stefan Monnier

Merge from emacs-23

parents 288cf4e9 36901266
2010-06-16 Chong Yidong <cyd@stupidchicken.com>
* INSTALL: Update font information (Bug#6389).
2010-06-16 Glenn Morris <rgm@gnu.org>
* INSTALL: General update.
2010-06-12 Glenn Morris <rgm@gnu.org>
* Makefile.in (install-arch-indep): Delete any old info .gz files first.
* Makefile.in (install-arch-indep): Delete any old info .gz files
first.
2010-06-11 Glenn Morris <rgm@gnu.org>
......
This diff is collapsed.
2010-06-10 Glenn Morris <rgm@gnu.org>
* basic.texi (Inserting Text): Minor clarification. (Bug#6374)
* basic.texi (Inserting Text): Fix typo.
2010-06-10 Glenn Morris <rgm@gnu.org>
* ack.texi (Acknowledgments):
......
@c This is part of the Emacs manual.
@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
@c 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
@c Free Software Foundation, Inc.
@c See file emacs.texi for copying conditions.
@node Basic, Minibuffer, Exiting, Top
@chapter Basic Editing Commands
......@@ -92,9 +93,9 @@ of overwriting with it.
@vindex read-quoted-char-radix
@noindent
To use decimal or hexadecimal instead of octal, set the variable
@code{read-quoted-char-radix} to 10 or 16. If the radix is greater
than 10, some letters starting with @kbd{a} serve as part of a
character code, just like digits.
@code{read-quoted-char-radix} to 10 or 16. If the radix is 16,
the letters @kbd{a} to @kbd{f} serve as part of a character code,
just like digits. Case is ignored.
A numeric argument tells @kbd{C-q} how many copies of the quoted
character to insert (@pxref{Arguments}).
......@@ -104,7 +105,7 @@ character to insert (@pxref{Arguments}).
@cindex Unicode
Instead of @kbd{C-q}, you can use @kbd{C-x 8 @key{RET}}
(@code{ucs-insert}) to insert a character based on its Unicode name or
code-point. This commands prompts for a character to insert, using
code-point. This command prompts for a character to insert, using
the minibuffer; you can specify the character using either (i) the
character's name in the Unicode standard, or (ii) the character's
code-point in the Unicode standard. If you specify the character's
......
2010-06-10 Glenn Morris <rgm@gnu.org>
* idlwave.texi (Load-Path Shadows):
* org.texi (Handling links): Fix typos.
2010-06-07 Teodor Zlatanov <tzz@lifelogs.com>
* gnus.texi (Interactive): Explain effect of gnus-expert-user better.
......
......@@ -3717,7 +3717,7 @@ C-i}. Here are the different routines (also available in the Menu
@table @asis
@item @kbd{M-x idlwave-list-buffer-load-path-shadows}
This commands checks the names of all routines defined in the current
This command checks the names of all routines defined in the current
buffer for shadowing conflicts with other routines accessible to
IDLWAVE. The command also has a key binding: @kbd{C-c C-b}
@item @kbd{M-x idlwave-list-shell-load-path-shadows}.
......
......@@ -2978,7 +2978,7 @@ link and description parts of the link.
Open link at point. This will launch a web browser for URLs (using
@command{browse-url-at-point}), run VM/MH-E/Wanderlust/Rmail/Gnus/BBDB for
the corresponding links, and execute the command in a shell link. When the
cursor is on an internal link, this commands runs the corresponding search.
cursor is on an internal link, this command runs the corresponding search.
When the cursor is on a TAG list in a headline, it creates the corresponding
TAGS view. If the cursor is on a timestamp, it compiles the agenda for that
date. Furthermore, it will visit text and remote files in @samp{file:} links
......
2010-06-12 Glenn Morris <rgm@gnu.org>
* tutorials/TUTORIAL.bg, tutorials/TUTORIAL.es: Fix typos.
2010-06-09 Michael Albinus <michael.albinus@gmx.de>
* NEWS: Add notifications.el.
......
......@@ -760,7 +760,7 @@ not try to give commands in it when no longer really in the debugger.
* New function `switch-to-buffer-other-window'.
This is the new primitive to select a specified buffer (the
argument) in another window. It is not quite the same as
argument) in another window. It is not quite the same as
`pop-to-buffer', because it is guaranteed to create another
window (assuming there is room on the screen) so that it can
leave the current window's old buffer displayed as well.
......@@ -971,7 +971,7 @@ once again "unmodified".
This command creates an inferior Lisp process whose input and output
appear in the Emacs buffer named `*lisp*'. That buffer uses a major mode
called inferior-lisp-mode, which has many of the commands of lisp-mode
and those of shell-mode. Calls the value of shell-mode-hook and
and those of shell-mode. Calls the value of shell-mode-hook and
lisp-mode-hook, in that order, if non-nil.
Meanwhile, in lisp-mode, the command C-M-x is defined to
......@@ -1421,7 +1421,7 @@ Changes in Emacs 15
of the executing emacs, for use in run-time conditionalization.
The function featurep of one argument may be used to test for the
presence of a feature. It is just the same as
presence of a feature. It is just the same as
(not (null (memq FEATURE features))) where FEATURE is its argument.
For example, (if (featurep 'magic-window-hack)
(transmogrify-window 'vertical)
......@@ -1541,13 +1541,13 @@ Changes in Emacs 15
This function returns a cons cell whose car is the object produced
by reading from the string and whose cdr is a number giving the
index in the string of the first character not read. That index may
index in the string of the first character not read. That index may
be passed as the second argument to a later call to read-from-string
to read the next form represented by the string.
In addition, the function read now accepts a string as its argument.
In this case, it calls read-from-string on the whole string, and
returns the car of the result. (ie the actual object read.)
returns the car of the result (ie the actual object read.)
......
......@@ -27,6 +27,10 @@ with a prefix argument or by typing C-u C-h C-n.
* Changes in Specialized Modes and Packages in Emacs 23.3
---
** The appt-add command takes an optional argument for the warning time.
This can be used in place of the default appt-message-warning-time.
* New Modes and Packages in Emacs 23.3
......
......@@ -625,7 +625,7 @@ C-f.
.
>> C-x b *Messages* <Return>,
. C-x C-b TUTORIAL <Return>,
. C-x b TUTORIAL <Return>,
.
......
......@@ -630,7 +630,7 @@ contiene los mensajes que han aparecido en la l
su sesión de Emacs.
>> Teclee C-x b *Messages* <Return> para ver el buffer de mensajes.
Luego teclee C-b TUTORIAL <Return> para regresar a este tutorial.
Luego teclee C-x b TUTORIAL <Return> para regresar a este tutorial.
Si hace cambios al texto de un archivo, y luego encuentra otro
archivo, esto no guarda el primer archivo. Sus cambios permanecerán
......
2010-06-16 Stefan Monnier <monnier@iro.umontreal.ca>
* font-lock.el (font-lock-major-mode): Rename from
font-lock-mode-major-mode to distinguish it from
global-font-lock-mode's own font-lock-mode-major-mode (bug#6135).
(font-lock-set-defaults):
* font-core.el (font-lock-default-function): Adjust users.
(font-lock-mode): Don't set it at all.
2010-06-16 Stefan Monnier <monnier@iro.umontreal.ca>
* vc-annotate.el (vc-annotate): Use vc-read-revision.
2010-06-16 Glenn Morris <rgm@gnu.org>
* calendar/appt.el (appt-time-msg-list): Doc fix.
(appt-check): Let-bind appt-warn-time.
(appt-add): Make the 3rd argument optional.
Simplify argument names. Doc fix. Check for integer WARNTIME.
Only add WARNTIME to the output list if non-nil.
2010-06-16 Ivan Kanis <apple@kanis.eu>
* calendar/appt.el (appt-check): Let the 3rd element of
appt-time-msg-list specify the warning time.
(appt-add): Add new argument with the warning time. (Bug#5176)
2010-06-16 Bob Rogers <rogers-emacs@rgrjr.dyndns.org> (tiny change)
* vc-svn.el (vc-svn-after-dir-status): Fix regexp for Subversions
older than version 1.6. (Bug#6361)
2010-06-16 Helmut Eller <eller.helmut@gmail.com>
* emacs-lisp/cl-macs.el (destructuring-bind): Bind `bind-enquote',
used by cl-do-arglist. (Bug#6408)
2010-06-16 Agustín Martín <agustin.martin@hispalinux.es>
* ispell.el (ispell-dictionary-base-alist): Fix
......
......@@ -183,16 +183,25 @@ Only relevant if reminders are being displayed in a window."
(defconst appt-buffer-name "*appt-buf*"
"Name of the appointments buffer.")
;; TODO Turn this into an alist? It would be easier to add more
;; optional elements.
;; TODO There should be a way to set WARNTIME (and other properties)
;; from the diary-file. Implementing that would be a good reason
;; to change this to an alist.
(defvar appt-time-msg-list nil
"The list of appointments for today.
Use `appt-add' and `appt-delete' to add and delete appointments.
The original list is generated from today's `diary-entries-list', and
can be regenerated using the function `appt-check'.
Each element of the generated list has the form (MINUTES STRING [FLAG]); where
MINUTES is the time in minutes of the appointment after midnight, and
STRING is the description of the appointment.
FLAG, if non-nil, says that the element was made with `appt-add'
so calling `appt-make-list' again should preserve it.")
Each element of the generated list has the form
\(MINUTES STRING [FLAG] [WARNTIME])
where MINUTES is the time in minutes of the appointment after midnight,
and STRING is the description of the appointment.
FLAG and WARNTIME can only be present if the element was made
with `appt-add'. A non-nil FLAG indicates that the element was made
with `appt-add', so calling `appt-make-list' again should preserve it.
If WARNTIME is non-nil, it is an integer to use in place
of `appt-message-warning-time'.")
(defconst appt-max-time (1- (* 24 60))
"11:59pm in minutes - number of minutes in a day minus 1.")
......@@ -313,7 +322,7 @@ displayed in a window:
(zerop (mod prev-appt-display-count appt-display-interval))))
;; Non-nil means only update the interval displayed in the mode line.
(mode-line-only (unless full-check appt-now-displayed))
now cur-comp-time appt-comp-time)
now cur-comp-time appt-comp-time appt-warn-time)
(when (or full-check mode-line-only)
(save-excursion
;; Convert current time to minutes after midnight (12.01am = 1).
......@@ -353,6 +362,8 @@ displayed in a window:
;; calculate the number of minutes until the appointment.
(when (and appt-issue-message appt-time-msg-list)
(setq appt-comp-time (caar (car appt-time-msg-list))
appt-warn-time (or (nth 3 (car appt-time-msg-list))
appt-message-warning-time)
min-to-app (- appt-comp-time cur-comp-time))
(while (and appt-time-msg-list
(< appt-comp-time cur-comp-time))
......@@ -360,21 +371,21 @@ displayed in a window:
(if appt-time-msg-list
(setq appt-comp-time (caar (car appt-time-msg-list)))))
;; If we have an appointment between midnight and
;; `appt-message-warning-time' minutes after midnight, we
;; `appt-warn-time' minutes after midnight, we
;; must begin to issue a message before midnight. Midnight
;; is considered 0 minutes and 11:59pm is 1439
;; minutes. Therefore we must recalculate the minutes to
;; appointment variable. It is equal to the number of
;; minutes before midnight plus the number of minutes after
;; midnight our appointment is.
(if (and (< appt-comp-time appt-message-warning-time)
(> (+ cur-comp-time appt-message-warning-time)
(if (and (< appt-comp-time appt-warn-time)
(> (+ cur-comp-time appt-warn-time)
appt-max-time))
(setq min-to-app (+ (- (1+ appt-max-time) cur-comp-time)
appt-comp-time)))
;; Issue warning if the appointment time is within
;; appt-message-warning time.
(when (and (<= min-to-app appt-message-warning-time)
(when (and (<= min-to-app appt-warn-time)
(>= min-to-app 0))
(setq appt-now-displayed t
appt-display-count (1+ prev-appt-display-count))
......@@ -470,14 +481,28 @@ Usually just deletes the appointment buffer."
"[0-9]?[0-9]\\(h\\([0-9][0-9]\\)?\\|[:.][0-9][0-9]\\)\\(am\\|pm\\)?")
;;;###autoload
(defun appt-add (new-appt-time new-appt-msg)
"Add an appointment for today at NEW-APPT-TIME with message NEW-APPT-MSG.
The time should be in either 24 hour format or am/pm format."
(interactive "sTime (hh:mm[am/pm]): \nsMessage: ")
(unless (string-match appt-time-regexp new-appt-time)
(defun appt-add (time msg &optional warntime)
"Add an appointment for today at TIME with message MSG.
The time should be in either 24 hour format or am/pm format.
Optional argument WARNTIME is an integer (or string) giving the number
of minutes before the appointment at which to start warning.
The default is `appt-message-warning-time'."
(interactive "sTime (hh:mm[am/pm]): \nsMessage:
sMinutes before the appointment to start warning: ")
(unless (string-match appt-time-regexp time)
(error "Unacceptable time-string"))
(let ((time-msg (list (list (appt-convert-time new-appt-time))
(concat new-appt-time " " new-appt-msg) t)))
(and (stringp warntime)
(setq warntime (unless (string-equal warntime "")
(string-to-number warntime))))
(and warntime
(not (integerp warntime))
(error "Argument WARNTIME must be an integer, or nil"))
(let ((time-msg (list (list (appt-convert-time time))
(concat time " " msg) t)))
;; It is presently non-sensical to have multiple warnings about
;; the same appointment with just different delays, but it might
;; not always be so. TODO
(if warntime (setq time-msg (append time-msg (list warntime))))
(unless (member time-msg appt-time-msg-list)
(setq appt-time-msg-list
(appt-sort-list (nconc appt-time-msg-list (list time-msg)))))))
......
......@@ -438,7 +438,7 @@ It is a list of elements of the form either:
;;;###autoload
(defmacro destructuring-bind (args expr &rest body)
(let* ((bind-lets nil) (bind-forms nil) (bind-inits nil)
(bind-defs nil) (bind-block 'cl-none))
(bind-defs nil) (bind-block 'cl-none) (bind-enquote nil))
(cl-do-arglist (or args '(&aux)) expr)
(append '(progn) bind-inits
(list (nconc (list 'let* (nreverse bind-lets))
......
......@@ -97,7 +97,7 @@ It will be passed one argument, which is the current value of
`font-lock-mode'.")
;; The mode for which font-lock was initialized, or nil if none.
(defvar font-lock-mode-major-mode)
(defvar font-lock-major-mode)
(define-minor-mode font-lock-mode
"Toggle Font Lock mode.
With arg, turn Font Lock mode off if and only if arg is a non-positive
......@@ -159,9 +159,7 @@ your own function which is called when `font-lock-mode' is toggled via
;; Arrange to unfontify this buffer if we change major mode later.
(if font-lock-mode
(add-hook 'change-major-mode-hook 'font-lock-change-mode nil t)
(remove-hook 'change-major-mode-hook 'font-lock-change-mode t))
(when font-lock-mode
(setq font-lock-mode-major-mode major-mode)))
(remove-hook 'change-major-mode-hook 'font-lock-change-mode t)))
;; Get rid of fontification for the old major mode.
;; We do this when changing major modes.
......@@ -213,8 +211,8 @@ this function onto `change-major-mode-hook'."
(and mode
(boundp 'font-lock-set-defaults)
font-lock-set-defaults
font-lock-mode-major-mode
(not (eq font-lock-mode-major-mode major-mode))))
font-lock-major-mode
(not (eq font-lock-major-mode major-mode))))
(font-lock-mode-internal mode)))
(defun turn-on-font-lock ()
......
......@@ -1783,15 +1783,18 @@ preserve `hi-lock-mode' highlighting patterns."
(kill-local-variable 'font-lock-set-defaults)
(font-lock-mode 1))
(defvar font-lock-mode-major-mode)
(defvar font-lock-major-mode nil
"Major mode for which the font-lock settings have been setup.")
(make-variable-buffer-local 'font-lock-major-mode)
(defun font-lock-set-defaults ()
"Set fontification defaults appropriately for this mode.
Sets various variables using `font-lock-defaults' (or, if nil, using
`font-lock-defaults-alist') and `font-lock-maximum-decoration'."
;; Set fontification defaults if not previously set for correct major mode.
(unless (and font-lock-set-defaults
(eq font-lock-mode-major-mode major-mode))
(setq font-lock-mode-major-mode major-mode)
(eq font-lock-major-mode major-mode))
(setq font-lock-major-mode major-mode)
(set (make-local-variable 'font-lock-set-defaults) t)
(make-local-variable 'font-lock-fontified)
(make-local-variable 'font-lock-multiline)
......
2010-06-12 Štěpán Němec <stepnem@gmail.com> (tiny change)
* url-vars.el (url-privacy-level): Fix doc typo. (Bug#6406)
2010-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
* url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
......
......@@ -128,7 +128,7 @@ email -- the email address
os -- the operating system info
lastloc -- the last location
agent -- do not send the User-Agent string
cookie -- never accept HTTP cookies
cookies -- never accept HTTP cookies
Samples:
......
......@@ -316,7 +316,7 @@ use; you may override this using the second optional arg MODE."
;;;###autoload
(defun vc-annotate (file rev &optional display-mode buf move-point-to)
"Display the edit history of the current file using colors.
"Display the edit history of the current FILE using colors.
This command creates a buffer that shows, for each line of the current
file, when it was last edited and by whom. Additionally, colors are
......@@ -326,7 +326,7 @@ default, the time scale stretches back one year into the past;
everything that is older than that is shown in blue.
With a prefix argument, this command asks two questions in the
minibuffer. First, you may enter a revision number; then the buffer
minibuffer. First, you may enter a revision number REV; then the buffer
displays and annotates that revision instead of the working revision
\(type RET in the minibuffer to leave that default unchanged). Then,
you are prompted for the time span in days which the color range
......@@ -348,9 +348,9 @@ mode-specific menu. `vc-annotate-color-map' and
(list buffer-file-name
(let ((def (vc-working-revision buffer-file-name)))
(if (null current-prefix-arg) def
(read-string
(vc-read-revision
(format "Annotate from revision (default %s): " def)
nil nil def)))
(list buffer-file-name) nil def)))
(if (null current-prefix-arg)
vc-annotate-display-mode
(float (string-to-number
......
......@@ -170,7 +170,7 @@ want to force an empty list of arguments, use t."
(?? . unregistered)
;; This is what vc-svn-parse-status does.
(?~ . edited)))
(re (if remote "^\\(.\\)...... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
(re (if remote "^\\(.\\)......? \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$"
;; Subexp 2 is a dummy in this case, so the numbers match.
"^\\(.\\)....\\(.\\) \\(.*\\)$"))
result)
......
2010-06-16 Glenn Morris <rgm@gnu.org>
* editfns.c (Fbyte_to_string): Pacify compiler.
2010-06-16 Stefan Monnier <monnier@iro.umontreal.ca>
* lread.c (read1): Phase out old-style backquotes a bit more.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment