From c5504d100573499a9ac373e71627d1b8ccb1f64f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sun, 28 Dec 2014 20:32:53 +0200 Subject: src/w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) --- src/ChangeLog | 4 ++++ src/w32proc.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3ea60571a1..94f07c88c0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2014-12-28 Eli Zaretskii + + * w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) + 2014-12-28 Paul Eggert Port memory-full checking to GnuTLS 3.3 diff --git a/src/w32proc.c b/src/w32proc.c index 96f1165789..408230ca90 100644 --- a/src/w32proc.c +++ b/src/w32proc.c @@ -3054,7 +3054,12 @@ If successful, the new CP is returned, otherwise nil. */) DEFUN ("w32-get-codepage-charset", Fw32_get_codepage_charset, Sw32_get_codepage_charset, 1, 1, 0, doc: /* Return charset ID corresponding to codepage CP. -Returns nil if the codepage is not valid. */) +Returns nil if the codepage is not valid or its charset ID could +not be determined. + +Note that this function is only guaranteed to work with ANSI +codepages; most console codepages are not supported and will +yield nil. */) (Lisp_Object cp) { CHARSETINFO info; -- cgit v1.2.3 From b5c9c131ca4c0382d32ccb9c59c02a0392276503 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 28 Dec 2014 15:06:16 -0800 Subject: Spelling fixes --- lisp/progmodes/python.el | 8 ++++---- nt/ChangeLog | 2 +- src/ChangeLog.10 | 2 +- src/ChangeLog.12 | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 0d80110f7b..c16b26100a 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@ -2531,7 +2531,7 @@ the python shell: (concat (format "# -*- coding: %s -*-\n" encoding) (make-string - ;; Substract 2 because of the coding cookie. + ;; Subtract 2 because of the coding cookie. (- (line-number-at-pos start) 2) ?\n)))) (toplevel-block-p (save-excursion (goto-char start) @@ -3951,7 +3951,7 @@ operator." (defun python-info-encoding-from-cookie () "Detect current buffer's encoding from its coding cookie. -Returns the enconding as a symbol." +Returns the encoding as a symbol." (let ((first-two-lines (save-excursion (save-restriction @@ -3968,9 +3968,9 @@ Returns the enconding as a symbol." "Return encoding for file. Try `python-info-encoding-from-cookie', if none is found then default to utf-8." - ;; If no enconding is defined, then it's safe to use UTF-8: Python 2 + ;; If no encoding is defined, then it's safe to use UTF-8: Python 2 ;; uses ASCII as default while Python 3 uses UTF-8. This means that - ;; in the worst case escenario python.el will make things work for + ;; in the worst case scenario python.el will make things work for ;; Python 2 files with unicode data and no encoding defined. (or (python-info-encoding-from-cookie) 'utf-8)) diff --git a/nt/ChangeLog b/nt/ChangeLog index e657e2b2a0..566af1a3d7 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -725,7 +725,7 @@ 2012-10-01 Eli Zaretskii * preprep.c (RVA_TO_PTR): Use 'unsigned char *' instead of - 'void *', for pointer arithmetics. + 'void *', for pointer arithmetic. (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET): Enclose all macro arguments in parentheses. diff --git a/src/ChangeLog.10 b/src/ChangeLog.10 index 1b77eaf580..f6d602b831 100644 --- a/src/ChangeLog.10 +++ b/src/ChangeLog.10 @@ -2826,7 +2826,7 @@ 2006-07-21 Eli Zaretskii * w32.c (convert_time): Use explicit long double constants to - ensure long double arithmetics is used throughout. + ensure long double arithmetic is used throughout. 2006-07-20 YAMAMOTO Mitsuharu diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 80d7460c73..60f9ea294b 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 @@ -2327,7 +2327,7 @@ 2012-12-08 Fabrice Popineau - * w32fns.c (emacs_abort): Don't do arithmetics on void pointers. + * w32fns.c (emacs_abort): Don't do arithmetic on void pointers. 2012-12-08 Eli Zaretskii @@ -4716,7 +4716,7 @@ defining an XRectangle structure. * w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer - arithmetics for compatibility with x64. + arithmetic for compatibility with x64. * w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for compatibility with x64. -- cgit v1.2.3 From 6444482c63b8f148c44904f11599de643e903dca Mon Sep 17 00:00:00 2001 From: Filipp Gunbin Date: Mon, 29 Dec 2014 17:33:11 +0300 Subject: Fix auto-revert-tail-mode for remote files Fixes: debbugs:19449 * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for remote files (bug#19449) --- lisp/ChangeLog | 4 ++++ lisp/autorevert.el | 17 ++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bd7959ea34..663526c382 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2014-12-29 Filipp Gunbin + + * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for remote files (bug#19449) + 2014-12-28 Eli Zaretskii * international/mule.el (define-coding-system): Fix typos in the diff --git a/lisp/autorevert.el b/lisp/autorevert.el index f1074e22e5..08c5452c8f 100644 --- a/lisp/autorevert.el +++ b/lisp/autorevert.el @@ -589,8 +589,8 @@ This is an internal function used by Auto-Revert Mode." ;; the values. (remote-file-name-inhibit-cache t) (revert - (or (and buffer-file-name - (or auto-revert-remote-files + (if buffer-file-name + (and (or auto-revert-remote-files (not (file-remote-p buffer-file-name))) (or (not auto-revert-use-notify) auto-revert-notify-modified-p) @@ -603,11 +603,11 @@ This is an internal function used by Auto-Revert Mode." (funcall (or buffer-stale-function #'buffer-stale--default-function) t))) - (and (or auto-revert-mode - global-auto-revert-non-file-buffers) - (funcall (or buffer-stale-function - #'buffer-stale--default-function) - t)))) + (and (or auto-revert-mode + global-auto-revert-non-file-buffers) + (funcall (or buffer-stale-function + #'buffer-stale--default-function) + t)))) eob eoblist) (setq auto-revert-notify-modified-p nil) (when revert @@ -690,8 +690,7 @@ the timer when no buffers need to be checked." (let ((bufs (if global-auto-revert-mode (buffer-list) auto-revert-buffer-list)) - (remaining ()) - (new ())) + remaining new) ;; Partition `bufs' into two halves depending on whether or not ;; the buffers are in `auto-revert-remaining-buffers'. The two ;; halves are then re-joined with the "remaining" buffers at the -- cgit v1.2.3 From 2d17e122a1a369e03e31e54f757b4e10034c1f91 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Dec 2014 16:27:09 +0100 Subject: Fix ChangeLog entry. --- lisp/ChangeLog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 663526c382..7d98f81b0d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,6 +1,7 @@ 2014-12-29 Filipp Gunbin - * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode for remote files (bug#19449) + * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode + for remote files. (Bug#19449) 2014-12-28 Eli Zaretskii -- cgit v1.2.3 From e792450d4b723ea4ba0037125b52075b57d0ae84 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Dec 2014 17:31:15 +0100 Subject: Sync with Tramp 2.2.11. * net/tramp-compat.el (top): Require cl-macs for Emacs 22. Make an alias for `default-toplevel-value' if it doesn't exist. * net/tramp-smb.el (tramp-smb-handle-copy-directory): Use `tramp-compat-delete-directory'. * net/trampver.el: Update release number. --- lisp/ChangeLog | 12 ++++++++++++ lisp/net/tramp-compat.el | 9 +++++++++ lisp/net/tramp-smb.el | 2 +- lisp/net/trampver.el | 4 ++-- 4 files changed, 24 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7d98f81b0d..7451734506 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,15 @@ +2014-12-29 Michael Albinus + + Sync with Tramp 2.2.11. + + * net/tramp-compat.el (top): Require cl-macs for Emacs 22. + Make an alias for `default-toplevel-value' if it doesn't exist. + + * net/tramp-smb.el (tramp-smb-handle-copy-directory): + Use `tramp-compat-delete-directory'. + + * net/trampver.el: Update release number. + 2014-12-29 Filipp Gunbin * autorevert.el (auto-revert-handler): Fix auto-revert-tail-mode diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index de63d8c7c7..62c1501a3d 100644 --- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -35,6 +35,11 @@ (eval-and-compile + ;; GNU Emacs 22. + (unless (fboundp 'ignore-errors) + (load "cl" 'noerror) + (load "cl-macs" 'noerror)) + ;; Some packages must be required for XEmacs, because we compile ;; with -no-autoloads. (when (featurep 'xemacs) @@ -586,6 +591,10 @@ and replace a sub-expression, e.g. (setq matches (cons (substring string start l) matches)) ; leftover (apply #'concat (nreverse matches)))))) +;; `default-toplevel-value' has been declared in Emacs 24. +(unless (fboundp 'default-toplevel-value) + (defalias 'default-toplevel-value 'symbol-value)) + (add-hook 'tramp-unload-hook (lambda () (unload-feature 'tramp-loaddefs 'force) diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 3d48f47e58..8f6a10221b 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -513,7 +513,7 @@ pass to the OPERATION." ;; Reset the transfer process properties. (tramp-set-connection-property v "process-name" nil) (tramp-set-connection-property v "process-buffer" nil) - (when t1 (delete-directory tmpdir 'recurse)))) + (when t1 (tramp-compat-delete-directory tmpdir 'recurse)))) ;; Handle KEEP-DATE argument. (when keep-date diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index 065c3f33eb..f1c36b8603 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -31,7 +31,7 @@ ;; should be changed only there. ;;;###tramp-autoload -(defconst tramp-version "2.2.11-pre" +(defconst tramp-version "2.2.11-24.5" "This version of Tramp.") ;;;###tramp-autoload @@ -44,7 +44,7 @@ (= emacs-major-version 21) (>= emacs-minor-version 4))) "ok" - (format "Tramp 2.2.11-pre is not fit for %s" + (format "Tramp 2.2.11-24.5 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version))))))) (unless (string-match "\\`ok\\'" x) (error "%s" x))) -- cgit v1.2.3 From 96ebe180f2d45dfdeaec7b0daeb08e6cf788f06e Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Dec 2014 17:35:09 +0100 Subject: Sync with Tramp 2.2.11. * automated/tramp-tests.el (tramp-test30-special-characters): Skip test on MS-Windows. --- test/ChangeLog | 9 ++++++++- test/automated/tramp-tests.el | 7 ++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 74d4677543..0e4e852bf8 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,6 +1,13 @@ +2014-12-29 Michael Albinus + + Sync with Tramp 2.2.11. + + * automated/tramp-tests.el (tramp-test30-special-characters): + Skip test on MS-Windows. + 2014-12-27 Fabián Ezequiel Gallina - (python-shell-buffer-substring-9): New test. + * automated/python-tests.el (python-shell-buffer-substring-9): New test. 2014-12-27 Fabián Ezequiel Gallina diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index 317ce12fc8..f80b7d4b8a 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1547,6 +1547,8 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." '(tramp-adb-file-name-handler tramp-gvfs-file-name-handler tramp-smb-file-name-handler)))) + ;; Bug#19463. + (skip-unless (not (eq system-type 'windows-nt))) ;; Newlines, slashes and backslashes in file names are not supported. ;; So we don't test. @@ -1742,10 +1744,9 @@ Since it unloads Tramp, it shall be the last test to run." ;; doesn't work well when an interactive password must be provided. ;; * Fix `tramp-test27-start-file-process' for `nc' and on MS ;; Windows (`process-send-eof'?). -;; * Fix `tramp-test28-shell-command' on MS Windows (nasty plink message). ;; * Fix `tramp-test30-special-characters' for `adb', `nc' and `smb'. -;; * Fix `tramp-test31-utf8' for MS Windows and `nc'/`telnet' (when -;; target is a dumb busybox). Seems to be in `directory-files'. +;; * Fix `tramp-test31-utf8' for `nc'/`telnet' (when target is a dumb +;; busybox). Seems to be in `directory-files'. ;; * Fix Bug#16928. Set expected error of `tramp-test32-asynchronous-requests'. ;; * Fix `tramp-test34-unload' (Not all symbols are unbound). Set ;; expected error. -- cgit v1.2.3 From 1c93fd3854c9ece51a3741c6b6264144b35dda7d Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Mon, 29 Dec 2014 17:37:37 +0100 Subject: Sync with Tramp 2.2.11. * trampver.texi: Update release number. --- doc/misc/ChangeLog | 7 +++++++ doc/misc/trampver.texi | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 48827efa26..c59077cb85 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,9 @@ +2014-12-29 Michael Albinus + + Sync with Tramp 2.2.11. + + * trampver.texi: Update release number. + 2014-11-10 Tassilo Horn * gnus.texi (HTML): Update section so that it mentions shr and w3m. @@ -339,6 +345,7 @@ 2014-02-16 Michael Albinus Sync with Tramp 2.2.9. + * trampver.texi: Update release number. * efaq-w32.texi (Tramp ssh): Remove also pscp1 and pscp2. diff --git a/doc/misc/trampver.texi b/doc/misc/trampver.texi index cfcb664018..ab13dedd6f 100644 --- a/doc/misc/trampver.texi +++ b/doc/misc/trampver.texi @@ -8,7 +8,7 @@ @c In the Tramp GIT, the version number is auto-frobbed from @c configure.ac, so you should edit that file and run @c "autoconf && ./configure" to change the version number. -@set trampver 2.2.11-pre +@set trampver 2.2.11 @c Other flags from configuration @set instprefix /usr/local -- cgit v1.2.3 From 9278f05860c41bd301ac0a5278f35f7cb10de20f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 29 Dec 2014 22:39:10 -0800 Subject: Omit trailing white space This should simplify switching to automated ChangeLogs. --- doc/man/ChangeLog | 1 - 1 file changed, 1 deletion(-) diff --git a/doc/man/ChangeLog b/doc/man/ChangeLog index 077d23d091..ea10c5fe78 100644 --- a/doc/man/ChangeLog +++ b/doc/man/ChangeLog @@ -180,4 +180,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - -- cgit v1.2.3 From d2612290f973ed70d973292d728cbe12a7f722fb Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Tue, 30 Dec 2014 12:45:48 +0100 Subject: * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): New defun. (tramp-test30-special-characters): Use it. (tramp--test-check-files): Filter nil file names out. --- test/ChangeLog | 7 +++++++ test/automated/tramp-tests.el | 31 ++++++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/test/ChangeLog b/test/ChangeLog index 0e4e852bf8..720f60bb7e 100644 --- a/test/ChangeLog +++ b/test/ChangeLog @@ -1,3 +1,10 @@ +2014-12-30 Michael Albinus + + * automated/tramp-tests.el (tramp--test-smb-or-windows-nt-p): + New defun. + (tramp-test30-special-characters): Use it. (Bug#19463) + (tramp--test-check-files): Filter nil file names out. + 2014-12-29 Michael Albinus Sync with Tramp 2.2.11. diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el index f80b7d4b8a..8e48b28042 100644 --- a/test/automated/tramp-tests.el +++ b/test/automated/tramp-tests.el @@ -1481,6 +1481,14 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (ignore-errors (delete-directory tmp-name1 'recursive))))) +(defun tramp--test-smb-or-windows-nt-p () + "Check, whether the locale or remote host runs MS Windows. +This requires restrictions of file name syntax." + (or (eq system-type 'windows-nt) + (eq (tramp-find-foreign-file-name-handler + tramp-test-temporary-file-directory) + 'tramp-smb-file-name-handler))) + (defun tramp--test-check-files (&rest files) "Runs a simple but comprehensive test over every file in FILES." (let ((tmp-name1 (tramp--test-make-temp-name)) @@ -1489,7 +1497,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (progn (make-directory tmp-name1) (make-directory tmp-name2) - (dolist (elt files) + (dolist (elt (delq nil files)) (let ((file1 (expand-file-name elt tmp-name1)) (file2 (expand-file-name elt tmp-name2))) (write-region elt nil file1) @@ -1545,26 +1553,23 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'." (memq (tramp-find-foreign-file-name-handler tramp-test-temporary-file-directory) '(tramp-adb-file-name-handler - tramp-gvfs-file-name-handler - tramp-smb-file-name-handler)))) - ;; Bug#19463. - (skip-unless (not (eq system-type 'windows-nt))) + tramp-gvfs-file-name-handler)))) ;; Newlines, slashes and backslashes in file names are not supported. ;; So we don't test. (tramp--test-check-files - " foo\tbar baz\t" + (if (tramp--test-smb-or-windows-nt-p) "foo bar baz" " foo\tbar baz\t") "$foo$bar$$baz$" "-foo-bar-baz-" "%foo%bar%baz%" "&foo&bar&baz&" - "?foo?bar?baz?" - "*foo*bar*baz*" - "'foo\"bar'baz\"" + (unless (tramp--test-smb-or-windows-nt-p) "?foo?bar?baz?") + (unless (tramp--test-smb-or-windows-nt-p) "*foo*bar*baz*") + (if (tramp--test-smb-or-windows-nt-p) "'foo'bar'baz'" "'foo\"bar'baz\"") "#foo~bar#baz~" - "!foo|bar!baz|" - ":foo;bar:baz;" - "bar" + (if (tramp--test-smb-or-windows-nt-p) "!foo!bar!baz!" "!foo|bar!baz|") + (if (tramp--test-smb-or-windows-nt-p) ";foo;bar;baz;" ":foo;bar:baz;") + (unless (tramp--test-smb-or-windows-nt-p) "bar") "(foo)bar(baz)" "[foo]bar[baz]" "{foo}bar{baz}")) @@ -1744,7 +1749,7 @@ Since it unloads Tramp, it shall be the last test to run." ;; doesn't work well when an interactive password must be provided. ;; * Fix `tramp-test27-start-file-process' for `nc' and on MS ;; Windows (`process-send-eof'?). -;; * Fix `tramp-test30-special-characters' for `adb', `nc' and `smb'. +;; * Fix `tramp-test30-special-characters' for `adb' and `nc'. ;; * Fix `tramp-test31-utf8' for `nc'/`telnet' (when target is a dumb ;; busybox). Seems to be in `directory-files'. ;; * Fix Bug#16928. Set expected error of `tramp-test32-asynchronous-requests'. -- cgit v1.2.3 From aa472a377134b7840fd7b9c97f948fb9440e6e9d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 30 Dec 2014 19:29:24 +0200 Subject: Fix the pixel coordinates returned by pos-visible-in-window-p. (Bug#19473) src/xdisp.c (pos_visible_p): Fix up the X coordinate for right-to-left screen lines. --- src/ChangeLog | 5 +++++ src/xdisp.c | 23 +++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 94f07c88c0..21303f2765 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2014-12-30 Eli Zaretskii + + * xdisp.c (pos_visible_p): Fix up the X coordinate for + right-to-left screen lines. (Bug#19473) + 2014-12-28 Eli Zaretskii * w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) diff --git a/src/xdisp.c b/src/xdisp.c index 173df5d011..f0a851acb5 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1403,6 +1403,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, struct text_pos top; int visible_p = 0; struct buffer *old_buffer = NULL; + bool r2l = false; if (FRAME_INITIAL_P (XFRAME (WINDOW_FRAME (w)))) return visible_p; @@ -1688,6 +1689,8 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, *rowh = max (0, (min (bottom_y, it.last_visible_y) - max (top_y, window_top_y))); *vpos = it.vpos; + if (it.bidi_it.paragraph_dir == R2L) + r2l = true; } } else @@ -1717,6 +1720,8 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, - max (it2.current_y, WINDOW_HEADER_LINE_HEIGHT (w)))); *vpos = it2.vpos; + if (it2.bidi_it.paragraph_dir == R2L) + r2l = true; } else bidi_unshelve_cache (it2data, 1); @@ -1726,10 +1731,20 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, if (old_buffer) set_buffer_internal_1 (old_buffer); - if (visible_p && w->hscroll > 0) - *x -= - window_hscroll_limited (w, WINDOW_XFRAME (w)) - * WINDOW_FRAME_COLUMN_WIDTH (w); + if (visible_p) + { + if (w->hscroll > 0) + *x -= + window_hscroll_limited (w, WINDOW_XFRAME (w)) + * WINDOW_FRAME_COLUMN_WIDTH (w); + /* For lines in an R2L paragraph, we need to mirror the X pixel + coordinate wrt the text area. For the reasons, see the + commentary in buffer_posn_from_coords and the explanation of + the geometry used by the move_it_* functions at the end of + the large commentart near the beginning of this file. */ + if (r2l) + *x = window_box_width (w, TEXT_AREA) - *x - 1; + } #if 0 /* Debugging code. */ -- cgit v1.2.3 From 9758516441411e217905ea07208152292775f32e Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 30 Dec 2014 21:51:34 +0200 Subject: Fix a typo in a comment in the previous commit. --- src/xdisp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xdisp.c b/src/xdisp.c index f0a851acb5..ab37a84d11 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -1741,7 +1741,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y, coordinate wrt the text area. For the reasons, see the commentary in buffer_posn_from_coords and the explanation of the geometry used by the move_it_* functions at the end of - the large commentart near the beginning of this file. */ + the large commentary near the beginning of this file. */ if (r2l) *x = window_box_width (w, TEXT_AREA) - *x - 1; } -- cgit v1.2.3 From 93796baeee0707c77959ffad8f6c46e26c23bbbf Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 31 Dec 2014 07:15:09 -0800 Subject: * autogen.sh: Port better to non-GNU 'cp'. Problem reported by Han Boetes. --- ChangeLog | 5 +++++ autogen.sh | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1b161abf11..2d02bdff3a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-12-31 Paul Eggert + + * autogen.sh: Port better to non-GNU 'cp'. + Problem reported by Han Boetes. + 2014-12-28 Paul Eggert * build-aux/git-hooks/commit-msg: Allow tabs. diff --git a/autogen.sh b/autogen.sh index 69812cdcfe..30e1877fba 100755 --- a/autogen.sh +++ b/autogen.sh @@ -229,7 +229,7 @@ if test -d .git/hooks; then *--backup*--verbose*) cp_options='--backup=numbered --verbose';; *) - cp_options='';; + cp_options='-f';; esac if test -n "$tailored_hooks"; then -- cgit v1.2.3 From 5a9710f6e6f568ac00bd21dcb5c2af48469debbe Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Thu, 1 Jan 2015 17:29:51 +0200 Subject: Make sure tool-bar changes are reflected on display. lisp/tool-bar.el (tool-bar-local-item) (tool-bar-local-item-from-menu): Call force-mode-line-update to make sure the tool-bar changes show on display. --- lisp/ChangeLog | 6 ++++++ lisp/tool-bar.el | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7451734506..135ee4749d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2015-01-01 Eli Zaretskii + + * tool-bar.el (tool-bar-local-item) + (tool-bar-local-item-from-menu): Call force-mode-line-update to + make sure the tool-bar changes show on display. + 2014-12-29 Michael Albinus Sync with Tramp 2.2.11. diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el index 6e5c8b7c44..6b732e9fb3 100644 --- a/lisp/tool-bar.el +++ b/lisp/tool-bar.el @@ -174,7 +174,8 @@ is less or equal to 256, then ICON.xpm, then ICON.pbm, and finally ICON.xbm, using `find-image'." (let* ((image-exp (tool-bar--image-expression icon))) (define-key-after map (vector key) - `(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props)))) + `(menu-item ,(symbol-name key) ,def :image ,image-exp ,@props)) + (force-mode-line-update))) ;;;###autoload (defun tool-bar-add-item-from-menu (command icon &optional map &rest props) @@ -239,7 +240,8 @@ holds a keymap." (if (and (consp rest) (consp (car rest))) (setq rest (cdr rest))) (append `(menu-item ,(car defn) ,rest) - (list :image image-exp) props))))))) + (list :image image-exp) props)))) + (force-mode-line-update)))) ;;; Set up some global items. Additions/deletions up for grabs. -- cgit v1.2.3 From a5f90a37622e9d0cb066da413846c1c3f6900b51 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 1 Jan 2015 08:58:26 -0800 Subject: * .gitattributes: New file. --- .gitattributes | 40 ++++++++++++++++++++++++++++++++++++++++ ChangeLog | 4 ++++ 2 files changed, 44 insertions(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000000..c568ba293d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,40 @@ +# Attributes of Emacs files in the Git repository. + +# Copyright 2015 Free Software Foundation, Inc. + +# This file is part of GNU Emacs. + +# GNU Emacs is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. + +# GNU Emacs is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with GNU Emacs. If not, see . + +# A few files use CRLF endings, even on non-Microsoft platforms. +# Do not warn about trailing whitespace with these files. +*.bat -whitespace +admin/charsets/mapfiles/PTCP154 -whitespace +leim/MISC-DIC/cangjie-table.b5 -whitespace +leim/MISC-DIC/cangjie-table.cns -whitespace +leim/MISC-DIC/pinyin.map -whitespace +lib-src/update-game-score.exe.manifest -whitespace +nt/nmake.defs -whitespace + +# Some files should not be treated as text when diffing or merging. +*.gpg binary +*.gz binary +*.icns binary +*.ico binary +*.pbm binary +*.pdf binary +*.png binary +*.sig binary +*.tiff binary +test/automated/data/decompress/foo-gzipped binary diff --git a/ChangeLog b/ChangeLog index 2d02bdff3a..5ae8b63632 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-01-01 Paul Eggert + + * .gitattributes: New file. + 2014-12-31 Paul Eggert * autogen.sh: Port better to non-GNU 'cp'. -- cgit v1.2.3