procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge from emacs-24; up to 2012-12-15T12:19:04Z!juri@jurta.org

Browse source
This commit is contained in:
Glenn Morris 2013-02-09 17:56:25 -08:00
commit 490a9458c8
9 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/ChangeLog
View file

@ -1,3 +1,7 @@
2013-02-10 Glenn Morris <rgm@gnu.org>
* trouble.texi (Checklist): Update bug keybinding.
2013-02-09 Eli Zaretskii <eliz@gnu.org>
* msdog.texi (Text and Binary): Delete the description of

2
doc/emacs/trouble.texi
View file

@ -662,7 +662,7 @@ will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
(If you want to suggest an improvement or new feature, use the same
address.) If you cannot send mail from inside Emacs, you can copy the
text of your report to your normal mail client (if your system
supports it, you can type @kbd{C-c m} to have Emacs do this for you)
supports it, you can type @kbd{C-c M-i} to have Emacs do this for you)
and send it to that address. Or you can simply send an email to that
address describing the problem.

4
doc/lispref/ChangeLog
View file

@ -1,3 +1,7 @@
2013-02-10 Glenn Morris <rgm@gnu.org>
* keymaps.texi (Creating Keymaps): Update make-keymap result.
2013-02-09 Eli Zaretskii <eliz@gnu.org>
* modes.texi (%-Constructs): Remove the description of %t.

4
doc/lispref/keymaps.texi
View file

@ -327,10 +327,12 @@ these characters to @code{nil}, and does not bind any other kind of
event. The argument @var{prompt} specifies a
prompt string, as in @code{make-sparse-keymap}.
@c This example seems kind of pointless, but I guess it serves
@c to contrast the result with make-sparse-keymap above.
@example
@group
(make-keymap)
@result{} (keymap #^[t nil nil nil @dots{} nil nil keymap])
@result{} (keymap #^[nil nil keymap nil nil nil @dots{}])
@end group
@end example

12
etc/NEWS
View file

@ -436,6 +436,11 @@ The PCL-CVS commands are still available via the keyboard.
** Using "unibyte: t" in Lisp source files is obsolete.
Use "coding: raw-text" instead.
** In the buffer made by `M-x report-emacs-bug', the `C-c m' binding
has been changed to `C-c M-i' (`report-emacs-bug-insert-to-mailer').
The previous binding, introduced in Emacs 24.1, was a mistake, because
`C-c LETTER' bindings are reserved for user customizations.
** Internationalization
*** New language environment: Persian.
@ -1262,9 +1267,10 @@ to use the old defaults relying on external mail facilities
(`sendmail-send-it' on GNU/Linux and other Unix-like systems, and
`mailclient-send-it' on Windows).
*** Typing C-c m in the buffer made by M-x report-emacs-bug transfers
the report to your desktop's preferred mail client, if there is one.
This uses either the "xdg-email" utility, or Mac OS's "open" command.
*** Typing `C-c m' in the buffer made by `M-x report-emacs-bug'
transfers the report to your desktop's preferred mail client, if there
is one. This uses either the "xdg-email" utility, or Mac OS's "open"
command.
*** See Changes in Specialized Modes and Packages for SMTPmail changes
and Mail mode changes

20
etc/TODO
View file

@ -399,14 +399,6 @@ rather than interactively. This a trivial one-liner in easy-mode.el.
Check the assignments file for other packages which might go in and
have been missed.
** Possibly install python-mode in place of python.el, or combine the two.
Someone needs to do the work of figuring out who all the non-trivial
python-mode.el contributors are and getting assignments.
http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02156.html
http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02201.html
http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02489.html
http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
** Make keymaps a first-class Lisp object (this means a rewrite of
keymap.c). What should it do apart from being opaque ?
multiple inheritance ? faster where-is ? no more fix_submap_inheritance ?
@ -416,7 +408,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
an example how to do part of this; see the XMenu* functions on msdos.c.
** Implement popular parts of the rest of the CL functions as compiler
macros in cl-macs.
macros in cl-macs. [Is this still relevant now that cl-lib exists?]
** Make compiler warnings about functions that might be undefined at run time
smarter, so that they know which files are required by the file being
@ -457,7 +449,8 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
** Allow unknown image types to be rendered via an external program
converting them to, say, PBM (in the same way as PostScript?). [does
doc-view.el do this, or could it be extended to do this?]
doc-view.el do this, or could it be extended to do this?
Does ImageMagick obsolete this idea?]
** Allow displaying an X window from an external program in a buffer,
e.g. to render graphics from Java applets. [gerd and/or wmperry
@ -613,6 +606,7 @@ http://lists.gnu.org/archive/html/emacs-devel/2008-02/msg02234.html
There was a special trick to detect mouse press in the lower right
corner and track mouse movements, but this did not work well, and was
not scalable to the new Lion "resize on every window edge" behavior.
[As of trunk r109635, 2012-08-15, the event loop no longer polls.]
**** (mouse-avoidance-mode 'banish) then minimize Emacs, will pop window back
up on top of all others
@ -719,12 +713,6 @@ images with lower bit depth.
*** Decide what to do with some uncommitted imagemagick support
functions for image size etc.
*** Test with more systems.
Tested on Fedora 12, 14, and the libmagick that ships with it.
I also tried using an ImageMagick compiled from their SVN, in
parallel with the one packaged by Fedora, it worked well.
Ubuntu 8.04 was tested, but it seems it ships a broken ImageMagick.
** nxml mode
*** High priority

6
lisp/ChangeLog
View file

@ -1,9 +1,13 @@
2013-02-10 Chong Yidong <cyd@gnu.org>
* mail/emacsbug.el (report-emacs-bug): Change binding of
report-emacs-bug-insert-to-mailer to C-c M-i (Bug#13510).
2013-02-09 Jay Belanger <jay.p.belanger@gmail.com>
* calc/calc.el (calc-allow-units-as-numbers): New variable.
* calc/calc-units.el (calc-convert-units): Use new variable.
2013-02-09 Eli Zaretskii <eliz@gnu.org>
* subr.el (buffer-file-type, default-buffer-file-type): Remove.

2
lisp/gnus/ChangeLog
View file

@ -1,7 +1,7 @@
2013-02-10 Katsumi Yamaoka <yamaoka@jpl.org>
* nnir.el ("nnir"): Add 'virtual ability to nnir backend. (This was
done in 2012-07-22 by Andrew Cohen, but I reverted it mistakenlly.)
done in 2012-07-22 by Andrew Cohen, but I reverted it mistakenly.)
2013-02-07 Gábor Vida <gabor.v.vida@ericsson.com> (tiny change)

2
lisp/mail/emacsbug.el
View file

@ -323,7 +323,7 @@ usually do not have translators for other languages.\n\n")))
(use-local-map (nconc (make-sparse-keymap) (current-local-map)))
(define-key (current-local-map) "\C-c\C-i" 'info-emacs-bug)
(if can-insert-mail
(define-key (current-local-map) "\C-cm"
(define-key (current-local-map) "\C-c\M-i"
'report-emacs-bug-insert-to-mailer))
(setq report-emacs-bug-send-command (get mail-user-agent 'sendfunc)
report-emacs-bug-send-hook (get mail-user-agent 'hookvar))