Commit a51e9ff7 authored by Glenn Morris's avatar Glenn Morris
Browse files

Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru

parents 913274cb ae11bda5
...@@ -22,7 +22,8 @@ inclusion in a future version of Emacs (see below). ...@@ -22,7 +22,8 @@ inclusion in a future version of Emacs (see below).
If you don't feel up to hacking Emacs, there are many other ways to If you don't feel up to hacking Emacs, there are many other ways to
help. You can answer questions on the mailing lists, write help. You can answer questions on the mailing lists, write
documentation, find and report bugs, contribute to the Emacs web documentation, find and report bugs, check if existing bug reports
are fixed in newer versions of Emacs, contribute to the Emacs web
pages, or develop a package that works with Emacs. pages, or develop a package that works with Emacs.
Here are some style and legal conventions for contributors to Emacs: Here are some style and legal conventions for contributors to Emacs:
......
...@@ -7,9 +7,24 @@ See the end of the file for license conditions. ...@@ -7,9 +7,24 @@ See the end of the file for license conditions.
If you are ready to start working on any of these TODO items, we If you are ready to start working on any of these TODO items, we
appreciate your help; please write to emacs-devel@gnu.org so we can be appreciate your help; please write to emacs-devel@gnu.org so we can be
aware that the problem is being addressed, and talk with you how to do aware that the problem is being addressed, and talk with you how to do
it best. Since Emacs is an FSF-copyrighted package, please be it best. Also to check that it hasn't been done already, since we
prepared to sign legal papers to transfer the copyright on your work don't always remember to update this file! It is best to consult
to the FSF. the latest version of this file in the Emacs source code repository.
Since Emacs is an FSF-copyrighted package, please be prepared to sign
legal papers to transfer the copyright on your work to the FSF.
For more details on this, see the section "Copyright Assignment"
in etc/CONTRIBUTE. That file also contains some more practical
details about getting involved.
As well as the issues listed here, there are bug reports at
<http://debbugs.gnu.org>. Bugs tagged "easy" ought to be suitable for
beginners to work on, but unfortunately we are not very good at using
this tag. Bugs tagged "help" are ones where assistance is required,
but may be difficult to fix. Bugs with severity "important" or higher
are the ones we consider more important, but these also may be
difficult to fix. Bugs with severity "minor" may be simpler, but this
is not always true.
* Tentative plan for Emacs-24 * Tentative plan for Emacs-24
...@@ -61,7 +76,7 @@ to use it. ...@@ -61,7 +76,7 @@ to use it.
** Convert all defvars with leading `*' in the doc-strings into defcustoms ** Convert all defvars with leading `*' in the doc-strings into defcustoms
of appropriate :type and :group. of appropriate :type and :group.
** Remove any leading `*'s from defcustom doc-strings. ** Remove any leading `*'s from defcustom doc-strings. [done?]
** Remove unnecessary autoload cookies from defcustoms. ** Remove unnecessary autoload cookies from defcustoms.
This needs a bit of care, since often people have become used to This needs a bit of care, since often people have become used to
...@@ -267,6 +282,9 @@ specified filters, specified timers, and specified hooks. ...@@ -267,6 +282,9 @@ specified filters, specified timers, and specified hooks.
** Remove the limitation that window and frame widths and heights can ** Remove the limitation that window and frame widths and heights can
be only full columns/lines. be only full columns/lines.
** The GNUstep port needs some serious attention, ideally from someone
familiar with GNUstep and Objective C.
* Other features we would like: * Other features we would like:
** Allow frames(terminals) created by emacsclient to inherit their environment ** Allow frames(terminals) created by emacsclient to inherit their environment
......
2013-02-17 Didier Verna <didier@didierverna.net>
* net/network-stream.el (network-stream-open-starttls):
Check that response to the starttls-command is non-nil. (Bug#13706)
2013-02-17 Stefan Monnier <monnier@iro.umontreal.ca> 2013-02-17 Stefan Monnier <monnier@iro.umontreal.ca>
   
* font-lock.el (lisp-font-lock-keywords-1, lisp-font-lock-keywords-2): * font-lock.el (lisp-font-lock-keywords-1, lisp-font-lock-keywords-2):
......
...@@ -262,8 +262,9 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality. ...@@ -262,8 +262,9 @@ STARTTLS upgrades even if Emacs doesn't have built-in TLS functionality.
;; EHLO for SMTP. ;; EHLO for SMTP.
(when (plist-get parameters :always-query-capabilities) (when (plist-get parameters :always-query-capabilities)
(network-stream-command stream capability-command eo-capa))) (network-stream-command stream capability-command eo-capa)))
(when (string-match success-string (when (let ((response
(network-stream-command stream starttls-command eoc)) (network-stream-command stream starttls-command eoc)))
(and response (string-match success-string response)))
;; The server said it was OK to begin STARTTLS negotiations. ;; The server said it was OK to begin STARTTLS negotiations.
(if builtin-starttls (if builtin-starttls
(let ((cert (network-stream-certificate host service parameters))) (let ((cert (network-stream-certificate host service parameters)))
......
2013-02-17 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (x_draw_vertical_border): For a window that is neither
the leftmost nor the rightmost, redraw both the left and the right
vertical borders. (Bug#13723)
2013-02-17 Stefan Monnier <monnier@iro.umontreal.ca> 2013-02-17 Stefan Monnier <monnier@iro.umontreal.ca>
   
* xml.c (init_libxml2_functions): * xml.c (init_libxml2_functions):
......
...@@ -28244,6 +28244,9 @@ x_draw_vertical_border (struct window *w) ...@@ -28244,6 +28244,9 @@ x_draw_vertical_border (struct window *w)
if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame))) if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
return; return;
   
/* Note: It is necessary to redraw bot the left and the right
borders, for when only this single window W is being
redisplayed. */
if (!WINDOW_RIGHTMOST_P (w) if (!WINDOW_RIGHTMOST_P (w)
&& !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w)) && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
{ {
...@@ -28257,7 +28260,7 @@ x_draw_vertical_border (struct window *w) ...@@ -28257,7 +28260,7 @@ x_draw_vertical_border (struct window *w)
   
FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1); FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
} }
else if (!WINDOW_LEFTMOST_P (w) if (!WINDOW_LEFTMOST_P (w)
&& !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w)) && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
{ {
int x0, x1, y0, y1; int x0, x1, y0, y1;
......
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