------------------------------------------------------------ revno: 118146 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2014-10-18 09:40:04 +0300 message: Ensure 8-byte stack alignment in w32select's callback. src/w32select.c (owner_callback): Mark with ALIGN_STACK attribute. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-10-17 16:14:37 +0000 +++ src/ChangeLog 2014-10-18 06:40:04 +0000 @@ -1,3 +1,7 @@ +2014-10-18 Eli Zaretskii + + * w32select.c (owner_callback): Mark with ALIGN_STACK attribute. + 2014-10-17 Eli Zaretskii * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on === modified file 'src/w32select.c' --- src/w32select.c 2014-07-17 15:37:48 +0000 +++ src/w32select.c 2014-10-18 06:40:04 +0000 @@ -95,8 +95,8 @@ static Lisp_Object render_all (Lisp_Object ignore); static void run_protected (Lisp_Object (*code) (Lisp_Object), Lisp_Object arg); static Lisp_Object lisp_error_handler (Lisp_Object error); -static LRESULT CALLBACK owner_callback (HWND win, UINT msg, - WPARAM wp, LPARAM lp); +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, + WPARAM wp, LPARAM lp); static HWND create_owner (void); static void setup_config (void); @@ -420,7 +420,7 @@ } -static LRESULT CALLBACK +static LRESULT CALLBACK ALIGN_STACK owner_callback (HWND win, UINT msg, WPARAM wp, LPARAM lp) { switch (msg) ------------------------------------------------------------ revno: 118145 committer: Ted Zlatanov branch nick: quickfixes timestamp: Fri 2014-10-17 21:02:30 -0400 message: net/gnutls.el: pass correct data to `gnutls-boot'. * net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass correct data to `gnutls-boot'. Reported by Toke H?iland-J?rgensen . diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-10-18 00:23:03 +0000 +++ lisp/ChangeLog 2014-10-18 01:02:30 +0000 @@ -1,3 +1,9 @@ +2014-10-18 Teodor Zlatanov + + * net/gnutls.el (gnutls-negotiate): Don't use cl-mapcan; pass + correct data to `gnutls-boot' (Bug#18664). + Reported by Toke Høiland-Jørgensen . + 2014-10-18 Michal Nazarewicz * whitespace.el (whitespace-style, whitespace-big-indent) === modified file 'lisp/net/gnutls.el' --- lisp/net/gnutls.el 2014-07-01 18:48:24 +0000 +++ lisp/net/gnutls.el 2014-10-18 01:02:30 +0000 @@ -211,11 +211,13 @@ t) ;; if a list, look for hostname matches ((listp gnutls-verify-error) - (cl-mapcan - (lambda (check) - (when (string-match (car check) hostname) - (copy-sequence (cdr check)))) - gnutls-verify-error)) + (apply 'append + (mapcar + (lambda (check) + (when (string-match (nth 0 check) + hostname) + (nth 1 check))) + gnutls-verify-error))) ;; else it's nil (t nil)))) (min-prime-bits (or min-prime-bits gnutls-min-prime-bits)) ------------------------------------------------------------ revno: 118144 author: Michal Nazarewicz committer: Ted Zlatanov branch nick: quickfixes timestamp: Fri 2014-10-17 20:23:03 -0400 message: Add a 'big-indent style to `whitespace-mode'. * lisp/whitespace.el (whitespace-style, whitespace-big-indent) (whitespace-big-indent-regexp, whitespace-style-value-list) (whitespace-toggle-option-alist, whitespace-interactive-char) (whitespace-toggle-options) (global-whitespace-toggle-options, whitespace-help-text) (whitespace-style-face-p, whitespace-color-on): Add a 'big-indent style to `whitespace-mode' to indicate that the line indentation is too deep. By default, 32 SPACEs or four TABs are considered too many but `whitespace-big-indent-regexp' can be configured. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-10-17 07:28:25 +0000 +++ lisp/ChangeLog 2014-10-18 00:23:03 +0000 @@ -1,3 +1,15 @@ +2014-10-18 Michal Nazarewicz + + * whitespace.el (whitespace-style, whitespace-big-indent) + (whitespace-big-indent-regexp, whitespace-style-value-list) + (whitespace-toggle-option-alist, whitespace-interactive-char) + (whitespace-toggle-options) + (global-whitespace-toggle-options, whitespace-help-text) + (whitespace-style-face-p, whitespace-color-on): Add a 'big-indent + style to `whitespace-mode' to indicate that the line indentation + is too deep. By default, 32 SPACEs or four TABs are considered + too many but `whitespace-big-indent-regexp' can be configured. + 2014-10-17 Michal Nazarewicz * textmodes/tildify.el (tildify--pick-alist-entry): rename from === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2014-05-29 22:51:47 +0000 +++ lisp/whitespace.el 2014-10-18 00:23:03 +0000 @@ -266,6 +266,8 @@ ;; `whitespace-indentation' Face used to visualize 8 or more ;; SPACEs at beginning of line. ;; +;; `whitespace-big-indent' Face used to visualize big indentation. +;; ;; `whitespace-empty' Face used to visualize empty lines at ;; beginning and/or end of buffer. ;; @@ -286,6 +288,9 @@ ;; `whitespace-indentation-regexp' Specify regexp for 8 or more ;; SPACEs at beginning of line. ;; +;; `whitespace-big-indent-regexp' Specify big indentation at beginning of line +;; regexp. +;; ;; `whitespace-empty-at-bob-regexp' Specify regexp for empty lines ;; at beginning of buffer. ;; @@ -452,6 +457,10 @@ It has effect only if `face' (see above) is present in `whitespace-style'. + big-indent Big indentations are visualized via faces. + It has effect only if `face' (see above) + is present in `whitespace-style'. + space-after-tab::tab 8 or more SPACEs after a TAB are visualized via faces. It has effect only if `face' (see above) @@ -544,6 +553,8 @@ (const :tag "(Face) NEWLINEs" newline) (const :tag "(Face) Indentation SPACEs" indentation) + (const :tag "(Face) Too much line indentation" + big-indent) (const :tag "(Face) Empty Lines At BOB And/Or EOB" empty) (const :tag "(Face) SPACEs after TAB" @@ -673,6 +684,12 @@ "Face used to visualize 8 or more SPACEs at beginning of line." :group 'whitespace) +(defface whitespace-big-indent + '((((class mono)) :inverse-video t :weight bold :underline t) + (t :background "red" :foreground "firebrick")) + "Face used to visualize big indentation." + :group 'whitespace) + (defvar whitespace-empty 'whitespace-empty "Symbol face used to visualize empty lines at beginning and/or end of buffer. @@ -838,6 +855,20 @@ string) :group 'whitespace) +(defcustom whitespace-big-indent-regexp + "^\\(\\(?:\t\\{4,\\}\\| \\{32,\\}\\)[\t ]*\\)" + "Specify big indentation regexp. + +If you're using `mule' package, there may be other characters +besides \"\\t\" that should be considered TAB. + +NOTE: Enclose always by \\\\( and \\\\) the elements to highlight. + Use exactly one pair of enclosing \\\\( and \\\\). + +Used when `whitespace-style' includes `big-indent'." + :type '(regexp :tag "Detect too much indentation at the beginning of a line") + :group 'whitespace) + (defcustom whitespace-line-column 80 "Specify column beyond which the line is highlighted. @@ -1141,6 +1172,7 @@ indentation indentation::tab indentation::space + big-indent space-after-tab space-after-tab::tab space-after-tab::space @@ -1167,6 +1199,7 @@ (?\C-i . indentation) (?I . indentation::tab) (?i . indentation::space) + (?\C-t . big-indent) (?\C-a . space-after-tab) (?A . space-after-tab::tab) (?a . space-after-tab::space) @@ -1250,6 +1283,7 @@ C-i toggle indentation SPACEs visualization (via `indent-tabs-mode') I toggle indentation SPACEs visualization i toggle indentation TABs visualization + C-t toggle big indentation visualization C-a toggle SPACEs after TAB visualization (via `indent-tabs-mode') A toggle SPACEs after TAB: SPACEs visualization a toggle SPACEs after TAB: TABs visualization @@ -1279,6 +1313,7 @@ indentation toggle indentation SPACEs visualization indentation::tab toggle indentation SPACEs visualization indentation::space toggle indentation TABs visualization + big-indent toggle big indentation visualization space-after-tab toggle SPACEs after TAB visualization space-after-tab::tab toggle SPACEs after TAB: SPACEs visualization space-after-tab::space toggle SPACEs after TAB: TABs visualization @@ -1329,6 +1364,7 @@ C-i toggle indentation SPACEs visualization (via `indent-tabs-mode') I toggle indentation SPACEs visualization i toggle indentation TABs visualization + C-t toggle big indentation visualization C-a toggle SPACEs after TAB visualization (via `indent-tabs-mode') A toggle SPACEs after TAB: SPACEs visualization a toggle SPACEs after TAB: TABs visualization @@ -1358,6 +1394,7 @@ indentation toggle indentation SPACEs visualization indentation::tab toggle indentation SPACEs visualization indentation::space toggle indentation TABs visualization + big-indent toggle big indentation visualization space-after-tab toggle SPACEs after TAB visualization space-after-tab::tab toggle SPACEs after TAB: SPACEs visualization space-after-tab::space toggle SPACEs after TAB: TABs visualization @@ -1856,6 +1893,7 @@ [] C-i - toggle indentation SPACEs visualization (via `indent-tabs-mode') [] I - toggle indentation SPACEs visualization [] i - toggle indentation TABs visualization + [] C-t - toggle big indentation visualization [] C-a - toggle SPACEs after TAB visualization (via `indent-tabs-mode') [] A - toggle SPACEs after TAB: SPACEs visualization [] a - toggle SPACEs after TAB: TABs visualization @@ -2109,6 +2147,7 @@ (memq 'indentation whitespace-active-style) (memq 'indentation::tab whitespace-active-style) (memq 'indentation::space whitespace-active-style) + (memq 'big-indent whitespace-active-style) (memq 'space-after-tab whitespace-active-style) (memq 'space-after-tab::tab whitespace-active-style) (memq 'space-after-tab::space whitespace-active-style) @@ -2196,6 +2235,9 @@ ;; Show indentation SPACEs (TABs). (whitespace-indentation-regexp 'space))) 1 whitespace-indentation t))) + ,@(when (memq 'big-indent whitespace-active-style) + ;; Show big indentation. + `((,whitespace-big-indent-regexp 1 'whitespace-big-indent t))) ,@(when (memq 'empty whitespace-active-style) ;; Show empty lines at beginning of buffer. `((,#'whitespace-empty-at-bob-regexp ------------------------------------------------------------ revno: 118143 author: Michal Nazarewicz committer: Ted Zlatanov branch nick: quickfixes timestamp: Fri 2014-10-17 20:22:13 -0400 message: Mention new whitespace-mode option: big-indent. * etc/NEWS: Mention new whitespace-mode option: big-indent. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2014-10-15 21:55:10 +0000 +++ etc/ChangeLog 2014-10-18 00:22:13 +0000 @@ -1,3 +1,7 @@ +2014-10-18 Michal Nazarewicz + + * NEWS: Mention new whitespace-mode option: big-indent. + 2014-10-15 Lars Magne Ingebrigtsen * NEWS: Mention multipart/related. === modified file 'etc/NEWS' --- etc/NEWS 2014-10-17 18:05:48 +0000 +++ etc/NEWS 2014-10-18 00:22:13 +0000 @@ -253,6 +253,10 @@ *** New custom variable `tex-print-file-extension' to help users who use PDF instead of DVI. +** whitespace-mode: new 'big-indent style highlighting too much indentation. +By default, 32 spaces and four TABs are considered to be too much but +`whitespace-big-indent-regexp' can be configured to change that. + ** Obsolete packages --- ------------------------------------------------------------ revno: 118142 committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-10-17 14:05:48 -0400 message: * configure.ac: Simplify OS X $canonical tests. * etc/NEWS: Clarify OS X entries. diff: === modified file 'ChangeLog' --- ChangeLog 2014-10-15 17:42:05 +0000 +++ ChangeLog 2014-10-17 18:05:48 +0000 @@ -1,3 +1,7 @@ +2014-10-17 Glenn Morris + + * configure.ac: Simplify OS X $canonical tests. + 2014-10-15 Jan Djärv * configure.ac: Move the OSX 10.6 test. === modified file 'configure.ac' --- configure.ac 2014-10-17 16:14:37 +0000 +++ configure.ac 2014-10-17 18:05:48 +0000 @@ -556,14 +556,10 @@ ## Apple Darwin / Mac OS X *-apple-darwin* ) case "${canonical}" in - i[3456]86-* ) ;; - powerpc-* ) unported=yes ;; - x86_64-* ) ;; + *-apple-darwin[0-9].*) unported=yes ;; + i[3456]86-* | x86_64-* ) ;; * ) unported=yes ;; esac - case "$canonical" in - *-apple-darwin[0-9].*) unported=yes ;; - esac opsys=darwin ## Use fink packages if available. ## FIXME find a better way to do this: http://debbugs.gnu.org/11507 === modified file 'etc/NEWS' --- etc/NEWS 2014-10-15 21:55:10 +0000 +++ etc/NEWS 2014-10-17 18:05:48 +0000 @@ -388,8 +388,9 @@ or Windows Server 2003. The built binaries still run on all versions of Windows starting with Windows 9X. -** Building Emacs on OSX with Coca (--with-ns) now requires 10.6 or newer. -PowerPC on OSX is not supported. +** OS X 10.5 or older is no longer supported. + +** OS X on PowerPC is no longer supported. ---------------------------------------------------------------------- ------------------------------------------------------------ revno: 118141 [merge] committer: Glenn Morris branch nick: trunk timestamp: Fri 2014-10-17 09:14:37 -0700 message: Merge from emacs-24; up to r117592 diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2014-10-16 06:55:34 +0000 +++ src/ChangeLog 2014-10-17 16:14:37 +0000 @@ -1,3 +1,10 @@ +2014-10-17 Eli Zaretskii + + * xterm.c (x_draw_hollow_cursor): Fix display of hollow cursor on + 1-pixel R2L characters. + Reported by Dmitry Antipov , see + http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00518.html. + 2014-10-16 Eli Zaretskii * bidi.c (bidi_find_bracket_pairs): Avoid a loop that does nothing === modified file 'src/xterm.c' --- src/xterm.c 2014-10-12 06:09:50 +0000 +++ src/xterm.c 2014-10-17 16:14:37 +0000 @@ -7984,7 +7984,8 @@ && cursor_glyph->pixel_width > w->phys_cursor_width) { x += cursor_glyph->pixel_width - w->phys_cursor_width; - wd -= 1; + if (wd > 0) + wd -= 1; } /* Set clipping, draw the rectangle, and reset clipping again. */ x_clip_to_row (w, row, TEXT_AREA, gc); ------------------------------------------------------------ revno: 118140 committer: Michal Nazarewicz branch nick: emacs-trunk timestamp: Fri 2014-10-17 09:28:25 +0200 message: Fix lisp/ChangeLog entry added in rev. 118139 diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2014-10-17 07:20:51 +0000 +++ lisp/ChangeLog 2014-10-17 07:28:25 +0000 @@ -1,4 +1,4 @@ -2014-06-05 Michal Nazarewicz +2014-10-17 Michal Nazarewicz * textmodes/tildify.el (tildify--pick-alist-entry): rename from tildify-mode-alist. ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.