[Emacs-diffs] /srv/bzr/emacs/trunk r111822: Merge from emacs-24; up to r111274

[Glenn Morris]

------------------------------------------------------------
revno: 111822 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-02-17 11:01:46 -0800
message:
  Merge from emacs-24; up to r111274
modified:
  etc/CONTRIBUTE
  etc/TODO
  lisp/ChangeLog
  lisp/net/network-stream.el
  src/ChangeLog
  src/xdisp.c

=== modified file 'etc/CONTRIBUTE'
--- a/etc/CONTRIBUTE    2013-01-01 09:11:05 +0000
+++ b/etc/CONTRIBUTE    2013-02-16 20:24:50 +0000
@@ -22,7 +22,8 @@
 
 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
-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.
 
 Here are some style and legal conventions for contributors to Emacs:

=== modified file 'etc/TODO'
--- a/etc/TODO  2013-02-10 01:56:25 +0000
+++ b/etc/TODO  2013-02-17 19:01:46 +0000
@@ -7,9 +7,24 @@
 If you are ready to start working on any of these TODO items, we
 appreciate your help; please write to address@hidden so we can be
 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
-prepared to sign legal papers to transfer the copyright on your work
-to the FSF.
+it best.  Also to check that it hasn't been done already, since we
+don't always remember to update this file!  It is best to consult
+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
 
@@ -61,7 +76,7 @@
 ** Convert all defvars with leading `*' in the doc-strings into defcustoms
 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.
 This needs a bit of care, since often people have become used to
@@ -267,6 +282,9 @@
 ** Remove the limitation that window and frame widths and heights can
   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:
 
 ** Allow frames(terminals) created by emacsclient to inherit their environment

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-02-17 16:58:12 +0000
+++ b/lisp/ChangeLog    2013-02-17 19:01:46 +0000
@@ -1,3 +1,8 @@
+2013-02-17  Didier Verna  <address@hidden>
+
+       * 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  <address@hidden>
 
        * font-lock.el (lisp-font-lock-keywords-1, lisp-font-lock-keywords-2):

=== modified file 'lisp/net/network-stream.el'
--- a/lisp/net/network-stream.el        2013-01-01 09:11:05 +0000
+++ b/lisp/net/network-stream.el        2013-02-16 02:45:24 +0000
@@ -262,8 +262,9 @@
        ;; EHLO for SMTP.
        (when (plist-get parameters :always-query-capabilities)
          (network-stream-command stream capability-command eo-capa)))
-      (when (string-match success-string
-                         (network-stream-command stream starttls-command eoc))
+      (when (let ((response
+                  (network-stream-command stream starttls-command eoc)))
+             (and response (string-match success-string response)))
        ;; The server said it was OK to begin STARTTLS negotiations.
        (if builtin-starttls
            (let ((cert (network-stream-certificate host service parameters)))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-17 16:49:27 +0000
+++ b/src/ChangeLog     2013-02-17 19:01:46 +0000
@@ -1,3 +1,9 @@
+2013-02-17  Eli Zaretskii  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xml.c (init_libxml2_functions):

=== modified file 'src/xdisp.c'
--- a/src/xdisp.c       2013-02-15 12:26:42 +0000
+++ b/src/xdisp.c       2013-02-17 19:01:46 +0000
@@ -28244,6 +28244,9 @@
   if (FRAME_HAS_VERTICAL_SCROLL_BARS (XFRAME (w->frame)))
     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)
       && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_RIGHT (w))
     {
@@ -28257,8 +28260,8 @@
 
       FRAME_RIF (f)->draw_vertical_window_border (w, x1, y0, y1);
     }
-  else if (!WINDOW_LEFTMOST_P (w)
-          && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
+  if (!WINDOW_LEFTMOST_P (w)
+      && !WINDOW_HAS_VERTICAL_SCROLL_BAR_ON_LEFT (w))
     {
       int x0, x1, y0, y1;