Commit 2d809ffa authored by Glenn Morris's avatar Glenn Morris

Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

parents 56cd351d b01682fb
2013-05-09 Glenn Morris <rgm@gnu.org>
* sending.texi (Mail Sending): Fix typo.
* windows.texi (Change Window): Fix typo.
* custom.texi (Changing a Variable): Fix typo.
* trouble.texi (Contributing): Remove obsolete info re pretesters.
2013-05-05 Paul Eggert <eggert@cs.ucla.edu> 2013-05-05 Paul Eggert <eggert@cs.ucla.edu>
`write-region-inhibit-fsync' defaults to noninteractive (Bug#14273). `write-region-inhibit-fsync' defaults to noninteractive (Bug#14273).
......
...@@ -345,7 +345,7 @@ hidden, nor on subgroups that are hidden or not visible in the buffer. ...@@ -345,7 +345,7 @@ hidden, nor on subgroups that are hidden or not visible in the buffer.
@kindex C-x C-c @r{(customization buffer)} @kindex C-x C-c @r{(customization buffer)}
@findex Custom-set @findex Custom-set
@findex Custom-save @findex Custom-save
The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent using to The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent to using
the @samp{[Set for Current Session]} button. The command @kbd{C-x the @samp{[Set for Current Session]} button. The command @kbd{C-x
C-s} (@code{Custom-save}) is like using the @samp{[Save for Future C-s} (@code{Custom-save}) is like using the @samp{[Save for Future
Sessions]} button. Sessions]} button.
......
...@@ -374,7 +374,7 @@ This is the default, unless you have already set the variables for ...@@ -374,7 +374,7 @@ This is the default, unless you have already set the variables for
sending mail via @code{smtpmail-send-it} (see below). sending mail via @code{smtpmail-send-it} (see below).
@item smtpmail-send-it @item smtpmail-send-it
Send mail using the through an external mail host, such as your Send mail through an external mail host, such as your
Internet service provider's outgoing SMTP mail server. If you have Internet service provider's outgoing SMTP mail server. If you have
not told Emacs how to contact the SMTP server, it prompts for this not told Emacs how to contact the SMTP server, it prompts for this
information, which is saved in the @code{smtpmail-smtp-server} variable information, which is saved in the @code{smtpmail-smtp-server} variable
......
...@@ -1138,12 +1138,9 @@ form that is clearly safe to install. ...@@ -1138,12 +1138,9 @@ form that is clearly safe to install.
@section Contributing to Emacs Development @section Contributing to Emacs Development
@cindex contributing to Emacs @cindex contributing to Emacs
If you would like to help pretest Emacs releases to assure they work If you would like to work on improving Emacs, please contact
well, or if you would like to work on improving Emacs, please contact the maintainers at @email{emacs-devel@@gnu.org}. You can ask for
the maintainers at @email{emacs-devel@@gnu.org}. A pretester suggested projects or suggest your own ideas.
should be prepared to investigate bugs as well as report them. If you'd
like to work on improving Emacs, please ask for suggested projects or
suggest your own ideas.
If you have already written an improvement, please tell us about it. If If you have already written an improvement, please tell us about it. If
you have not yet started work, it is useful to contact you have not yet started work, it is useful to contact
......
...@@ -258,7 +258,7 @@ Make all windows the same height (@code{balance-windows}). ...@@ -258,7 +258,7 @@ Make all windows the same height (@code{balance-windows}).
the space that it occupied is given to an adjacent window (but not the the space that it occupied is given to an adjacent window (but not the
minibuffer window, even if that is active at the time). Deleting the minibuffer window, even if that is active at the time). Deleting the
window has no effect on the buffer it used to display; the buffer window has no effect on the buffer it used to display; the buffer
continues to exist, and you can still switch to with @kbd{C-x b}. continues to exist, and you can still switch to it with @kbd{C-x b}.
@findex kill-buffer-and-window @findex kill-buffer-and-window
@kindex C-x 4 0 @kindex C-x 4 0
......
...@@ -41,6 +41,9 @@ a web search is often the best way to find results. ...@@ -41,6 +41,9 @@ a web search is often the best way to find results.
The Emacs Wiki has an area for storing elisp files The Emacs Wiki has an area for storing elisp files
<URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>. <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
* WikEmacs
<URL:http://wikemacs.org> is an alternative wiki for Emacs.
* Emacs slides and tutorials can be found here: * Emacs slides and tutorials can be found here:
<URL:http://web.psung.name/emacs/> <URL:http://web.psung.name/emacs/>
......
2013-05-09 Ulrich Mueller <ulm@gentoo.org>
* descr-text.el (describe-char): Fix %d/%x typo. (Bug#14360)
2013-05-09 Glenn Morris <rgm@gnu.org> 2013-05-09 Glenn Morris <rgm@gnu.org>
* international/fontset.el (vertical-centering-font-regexp): * international/fontset.el (vertical-centering-font-regexp):
......
...@@ -753,7 +753,7 @@ relevant to POS." ...@@ -753,7 +753,7 @@ relevant to POS."
(insert " by these characters:\n") (insert " by these characters:\n")
(while (and (<= from to) (while (and (<= from to)
(setq glyph (lgstring-glyph gstring from))) (setq glyph (lgstring-glyph gstring from)))
(insert (format " %c (#x%d)\n" (insert (format " %c (#x%x)\n"
(lglyph-char glyph) (lglyph-char glyph))) (lglyph-char glyph) (lglyph-char glyph)))
(setq from (1+ from))))) (setq from (1+ from)))))
(insert " by the rule:\n\t(") (insert " by the rule:\n\t(")
......
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