commit 2cf501ce1b77e6e409871eef7b9d31a08e73cfc0 (HEAD, refs/remotes/origin/master) Author: HOSOYA Kei Date: Sun Jul 26 00:25:05 2015 -0700 * etc/tutorials/TUTORIAL.ja: Improve translation. Copyright-paperwork-exempt: yes diff --git a/etc/tutorials/TUTORIAL.ja b/etc/tutorials/TUTORIAL.ja index c090027..f92350a 100644 --- a/etc/tutorials/TUTORIAL.ja +++ b/etc/tutorials/TUTORIAL.ja @@ -922,8 +922,8 @@ C-g では再帰編集レベルからは抜け出せません。これは、C-g が再帰編集レベ $Bル内でのコマンドや引数を取り消すのに使われているからです。 -*もっともっとヘルプ -==================== +*更にヘルプを得るには +====================== この入門ガイドでは Emacs を使い始めるのに十分な情報を提供したつもりで す。Emacs にはあまりにも多くの機能があるので、ここですべてを説明するの commit 7c3506eda86d7e6539cf15836c01d3d5321a9f0e Author: Eli Zaretskii Date: Sat Jul 25 19:33:51 2015 +0300 Avoid crashes when w32 GUI functions are called in -batch * src/w32fns.c (Fx_frame_geometry, Fw32_frame_rect) (Fw32_frame_menu_bar_size, Fw32_send_sys_command): Don't call FRAME_W32_WINDOW for initial frame. (Bug#21132) diff --git a/src/w32fns.c b/src/w32fns.c index 8f9c56c..bf81078 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -6935,7 +6935,8 @@ If optional parameter FRAME is not specified, use selected frame. */) CHECK_NUMBER (command); - PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0); + if (FRAME_W32_P (f)) + PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, XINT (command), 0); return Qnil; } @@ -7522,6 +7523,9 @@ If FRAME is omitted or nil, the selected frame is used. */) MENUBARINFO menu_bar; int width, height, single_height, wrapped_height; + if (FRAME_INITIAL_P (f)) + return Qnil; + block_input (); single_height = GetSystemMetrics (SM_CYMENU); @@ -7553,6 +7557,9 @@ title bar and decorations. */) struct frame *f = decode_live_frame (frame); RECT rect; + if (FRAME_INITIAL_P (f)) + return Qnil; + block_input (); if (!NILP (client)) @@ -7610,6 +7617,9 @@ elements (all size values are in pixels). int single_bar_height, wrapped_bar_height, menu_bar_height; Lisp_Object fullscreen = Fframe_parameter (frame, Qfullscreen); + if (FRAME_INITIAL_P (f)) + return Qnil; + block_input (); /* Outer frame rectangle, including outer borders and title bar. */ commit 5e63841f2847b0b07cf15aed98c26fe914e9804a Author: Eli Zaretskii Date: Sat Jul 25 12:35:16 2015 +0300 Fix flyspell-check-previous-highlighted-word * lisp/textmodes/flyspell.el (flyspell-check-previous-highlighted-word): Really accept a numeric argument, as the doc string describes. Fix an off-by-one error in looking up overlays, so invocation with point immediately after a word would check that word. Clarify the doc string as Suggested by N. Jackson . (Bug#21129) diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el index a5dff07..2329f29 100644 --- a/lisp/textmodes/flyspell.el +++ b/lisp/textmodes/flyspell.el @@ -1827,11 +1827,12 @@ as returned by `ispell-parse-output'." ;;* flyspell-check-previous-highlighted-word ... */ ;;*---------------------------------------------------------------------*/ (defun flyspell-check-previous-highlighted-word (&optional arg) - "Correct the closer misspelled word. -This function scans a mis-spelled word before the cursor. If it finds one -it proposes replacement for that word. With prefix arg, count that many -misspelled words backwards." - (interactive) + "Correct the closest previous word that is highlighted as misspelled. +This function scans for a word which starts before point that has been +highlighted by Flyspell as misspelled. If it finds one, it proposes +a replacement for that word. With prefix arg N, check the Nth word +before point that's highlighted as misspelled." + (interactive "P") (let ((pos1 (point)) (pos (point)) (arg (if (or (not (numberp arg)) (< arg 1)) 1 arg)) @@ -1842,7 +1843,7 @@ misspelled words backwards." (setq pos1 pos) (if (> pos (point-min)) (progn - (setq ovs (overlays-at (1- pos))) + (setq ovs (overlays-at pos)) (while (consp ovs) (setq ov (car ovs)) (setq ovs (cdr ovs))