Commit b0edd7c6 authored by Fabián Ezequiel Gallina's avatar Fabián Ezequiel Gallina

Merge from origin/emacs-24

b544ab56 Fix return value of vertical-motion at ZV  (Bug#19553)
1f179ea1 Fix encoding of I/O in net-utils.el for MS-Windows.  (Bug#19458)
70f298f8 Fix the description of -nl in --help text.  (Bug#19542)
parents f4fcb103 b544ab56
2015-01-09 Eli Zaretskii <eliz@gnu.org>
* net/net-utils.el (net-utils-run-program, net-utils-run-simple):
On MS-Windows, bind coding-system-for-read to the console output
codepage. (Bug#19458)
2015-01-04 Dmitry Gutov <dgutov@yandex.ru>
Unbreak `mouse-action' property in text buttons.
......
......@@ -328,7 +328,15 @@ This variable is only used if the variable
(defun net-utils-run-program (name header program args)
"Run a network information program."
(let ((buf (get-buffer-create (concat "*" name "*"))))
(let ((buf (get-buffer-create (concat "*" name "*")))
(coding-system-for-read
;; MS-Windows versions of network utilities output text
;; encoded in the console (a.k.a. "OEM") codepage, which is
;; different from the default system (a.k.a. "ANSI")
;; codepage.
(if (eq system-type 'windows-nt)
(intern (format "cp%d" (w32-get-console-output-codepage)))
coding-system-for-read)))
(set-buffer buf)
(erase-buffer)
(insert header "\n")
......@@ -352,7 +360,15 @@ This variable is only used if the variable
(when proc
(set-process-filter proc nil)
(delete-process proc)))
(let ((inhibit-read-only t))
(let ((inhibit-read-only t)
(coding-system-for-read
;; MS-Windows versions of network utilities output text
;; encoded in the console (a.k.a. "OEM") codepage, which is
;; different from the default system (a.k.a. "ANSI")
;; codepage.
(if (eq system-type 'windows-nt)
(intern (format "cp%d" (w32-get-console-output-codepage)))
coding-system-for-read)))
(erase-buffer))
(net-utils-mode)
(setq-local net-utils--revert-cmd
......
2015-01-10 Eli Zaretskii <eliz@gnu.org>
* indent.c (Fvertical_motion): Return zero if we started from ZV
and there's an overlay after-string there. (Bug#19553)
2015-01-09 Eli Zaretskii <eliz@gnu.org>
* emacs.c (usage_message): Fix the description of the -nl switch.
(Bug#19542)
2015-01-05 Eli Zaretskii <eliz@gnu.org>
* xdisp.c (move_it_to, try_cursor_movement): Don't use the window
......
......@@ -231,7 +231,7 @@ Initialization options:\n\
"\
--no-desktop do not load a saved desktop\n\
--no-init-file, -q load neither ~/.emacs nor default.el\n\
--no-shared-memory, -nl do not use shared memory\n\
--no-loadup, -nl do not load loadup.el into bare Emacs\n\
--no-site-file do not load site-start.el\n\
--no-site-lisp, -nsl do not add site-lisp directories to load-path\n\
--no-splash do not display a splash screen on startup\n\
......
......@@ -2137,10 +2137,15 @@ whether or not it is currently displayed in some window. */)
if (nlines > 1)
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines - 1));
}
else
else /* it_start = ZV */
{
it.vpos = 0;
move_it_by_lines (&it, min (PTRDIFF_MAX, nlines));
/* We could have some display or overlay string at ZV,
in which case it.vpos will be nonzero now, while
actually we didn't move vertically at all. */
if (IT_CHARPOS (it) == CHARPOS (pt) && CHARPOS (pt) == it_start)
it.vpos = 0;
}
}
......
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