From 9aabf64c78017a55dedab5481ed20776c57f284b Mon Sep 17 00:00:00 2001 From: Jan Djärv Date: Tue, 8 Feb 2011 08:19:20 +0100 Subject: * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become zero. Fixes: debbugs:7348 --- src/ChangeLog | 5 +++++ src/nsterm.m | 2 ++ 2 files changed, 7 insertions(+) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2b02030fd4f..2df187383a4 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-08 Jan Djärv + + * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become + zero (Bug#7348). + 2011-02-03 Glenn Morris * xfaces.c (Finternal_set_lisp_face_attribute): diff --git a/src/nsterm.m b/src/nsterm.m index addb6d01d71..30b73c2fd13 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -5721,6 +5721,7 @@ ns_term_shutdown (int sig) win = nwin; condemned = NO; pixel_height = NSHeight (r); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; frame = XFRAME (XWINDOW (win)->frame); @@ -5750,6 +5751,7 @@ ns_term_shutdown (int sig) NSTRACE (EmacsScroller_setFrame); /* BLOCK_INPUT; */ pixel_height = NSHeight (newRect); + if (pixel_height == 0) pixel_height = 1; min_portion = 20 / pixel_height; [super setFrame: newRect]; [self display]; -- cgit v1.3 From bae1fa42dc24348d6ba303b633a3cf19dec625fa Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Tue, 8 Feb 2011 19:11:15 -0500 Subject: Fix to select_window. http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg00346.html * window.c (select_window): Check inhibit_point_swap argument when deciding whether to return immediately. --- src/ChangeLog | 5 +++++ src/window.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index 2df187383a4..9fbf1841982 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-09 Martin Rudalics + + * window.c (select_window): Check inhibit_point_swap argument when + deciding whether to return immediately. + 2011-02-08 Jan Djärv * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become diff --git a/src/window.c b/src/window.c index 12775ffa7d4..3e6062a7153 100644 --- a/src/window.c +++ b/src/window.c @@ -3607,7 +3607,7 @@ select_window (window, norecord, inhibit_point_swap) XSETFASTINT (w->use_time, window_select_count); } - if (EQ (window, selected_window)) + if (EQ (window, selected_window) && !inhibit_point_swap) return window; sf = SELECTED_FRAME (); -- cgit v1.3 From b762841f959188397404ed752f0f6ed9db5c93fb Mon Sep 17 00:00:00 2001 From: Juanma Barranquero Date: Sat, 12 Feb 2011 04:17:00 +0100 Subject: Fix trivial typos in comments and ChangeLogs. --- etc/ChangeLog | 2 +- lisp/ChangeLog | 18 +++++++++--------- lisp/cedet/srecode/fields.el | 2 +- lisp/ediff-mult.el | 2 +- lisp/emacs-lisp/checkdoc.el | 2 +- lisp/emulation/cua-base.el | 2 +- lisp/gnus/ChangeLog.2 | 2 +- lisp/mh-e/ChangeLog.1 | 2 +- lisp/textmodes/reftex-index.el | 2 +- src/ChangeLog | 8 ++++---- 10 files changed, 21 insertions(+), 21 deletions(-) (limited to 'src') diff --git a/etc/ChangeLog b/etc/ChangeLog index dc80bcb3964..82020dc3c9c 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@ -164,7 +164,7 @@ * srecode/doc-default.srt (section-comment, function-comment) (variable-same-line-comment, group-comment-start, group-comment-end): * srecode/doc-java.srt (function-comment, variable-same-line-comment) - (group-comment-start, gropu-comment-end): + (group-comment-start, group-comment-end): Fix typos in template docstrings. 2010-01-14 Kenichi Handa diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ec28bbb1eaf..6f2b228eaf8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -376,7 +376,7 @@ (rmail-mime-insert-text): Call rmail-mime-insert-decoded-text. (rmail-mime-insert-image): Argument changed. Caller changed. (rmail-mime-image): Call rmail-mime-toggle-hidden. - (rmail-mime-set-bulk-data): New funciton. + (rmail-mime-set-bulk-data): New function. (rmail-mime-insert-bulk): Argument changed. (rmail-mime-multipart-handler): Return t. (rmail-mime-process-multipart): Argument changed. @@ -1076,7 +1076,7 @@ is indented differently if it is after a begin..end clock. (verilog-in-attribute-p, verilog-skip-backward-comments) (verilog-skip-forward-comment-p): Support proper treatment of - attributes by indent code. Reported by Jeff Steele. + attributes by indent code. Reported by Jeff Steele. (verilog-in-directive-p): Fix comment to correctly describe function. (verilog-backward-up-list, verilog-in-struct-region-p) (verilog-backward-token, verilog-in-struct-p) @@ -1087,9 +1087,9 @@ (verilog-property-re, verilog-endcomment-reason-re) (verilog-beg-of-statement, verilog-set-auto-endcomments) (verilog-calc-1 ): Fix for assert a; else b; indentation (new form - of if). Reported by Max Bjurling and + of if). Reported by Max Bjurling and (verilog-calc-1): Fix for clocking block in modport - declaration. Reported by Brian Hunter. + declaration. Reported by Brian Hunter. 2010-10-23 Wilson Snyder @@ -1105,7 +1105,7 @@ (verilog-read-always-signals-recurse, verilog-read-decls): Fix not treating `elsif similar to `endif inside AUTOSENSE. (verilog-do-indent): Implement correct automatic or static task or - function end comment highlight. Reported by Steve Pearlmutter. + function end comment highlight. Reported by Steve Pearlmutter. (verilog-font-lock-keywords-2): Fix highlighting of single character pins, bug264. Reported by Michael Laajanen. (verilog-auto-inst, verilog-read-decls, verilog-read-sub-decls) @@ -1116,7 +1116,7 @@ Reported by Mark Johnson. (verilog-auto-tieoff, verilog-auto-tieoff-ignore-regexp): Add 'verilog-auto-tieoff-ignore-regexp' for AUTOTIEOFF, - bug269. Suggested by Gary Delp. + bug269. Suggested by Gary Delp. (verilog-mode-map, verilog-preprocess, verilog-preprocess-history) (verilog-preprocessor, verilog-set-compile-command): Create verilog-preprocess and verilog-preprocessor to show @@ -1124,7 +1124,7 @@ (verilog-get-beg-of-line, verilog-get-end-of-line) (verilog-modi-file-or-buffer, verilog-modi-name) (verilog-modi-point, verilog-within-string): Move defmacro's - before first use to avoid warning. Reported by Steve Pearlmutter. + before first use to avoid warning. Reported by Steve Pearlmutter. (verilog-colorize-buffer, verilog-colorize-include-files-buffer) (verilog-colorize-region, verilog-highlight-buffer) (verilog-highlight-includes, verilog-highlight-modules) @@ -1156,7 +1156,7 @@ (verilog-alw-get-temps, verilog-auto-reset) (verilog-auto-sense-sigs, verilog-read-always-signals) (verilog-read-always-signals-recurse): Fix loop indexes being - AUTORESET. AUTORESET now assumes any variables in the + AUTORESET. AUTORESET now assumes any variables in the initialization section of a for() should be ignored. Reported by Dan Dever. (verilog-error-font-lock-keywords) @@ -3139,7 +3139,7 @@ 2010-02-03 Michael Albinus * net/ange-ftp.el (ange-ftp-insert-directory): Parse directory - also in case of (and (not full) (not wildcard)). This is needed, + also in case of (and (not full) (not wildcard)). This is needed, when dired is called with a list of files, which are not in `default-directory'. (Bug#5478) diff --git a/lisp/cedet/srecode/fields.el b/lisp/cedet/srecode/fields.el index 9092467a583..817bb93d2fd 100644 --- a/lisp/cedet/srecode/fields.el +++ b/lisp/cedet/srecode/fields.el @@ -198,7 +198,7 @@ If SET-TO is a string, then replace the text of OLAID wit SET-TO." (oset ir fields srecode-field-archive) (setq srecode-field-archive nil) - ;; Initailize myself first. + ;; Initialize myself first. (call-next-method) ) diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 6b6996c5dd1..f9ff78977cc 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -306,7 +306,7 @@ buffers." (nth 3 elt)) (defsubst ediff-get-session-objC (elt) (nth 4 elt)) -;; Take the "name" component of the object into acount. ObjA/C/B is of the form +;; Take the "name" component of the object into account. ObjA/C/B is of the form ;; (name . equality-indicator) (defsubst ediff-get-session-objA-name (elt) (car (nth 2 elt))) diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el index 6726e83c77b..70360eb77cf 100644 --- a/lisp/emacs-lisp/checkdoc.el +++ b/lisp/emacs-lisp/checkdoc.el @@ -1817,7 +1817,7 @@ Replace with \"%s\"? " original replace) (let ((found nil) (start (point)) (msg nil) (ms nil)) (while (and (not msg) (re-search-forward - ;; Ignore manual page refereces like + ;; Ignore manual page references like ;; git-config(1). "[^-([`':a-zA-Z]\\(\\w+[:-]\\(\\w\\|\\s_\\)+\\)[^](']" e t)) diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el index e590d09b783..60ebefdd155 100644 --- a/lisp/emulation/cua-base.el +++ b/lisp/emulation/cua-base.el @@ -247,7 +247,7 @@ ;; [C-d] Moves (i.e. deletes and inserts) a single character to the ;; global mark. ;; [backspace] deletes the character before the global mark, while -;; [delete] deltes the character after the global mark. +;; [delete] deletes the character after the global mark. ;; [S-C-space] Jumps to and cancels the global mark. ;; [C-u S-C-space] Cancels the global mark (stays in current buffer). diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2 index b74c8106668..a468c2698a4 100644 --- a/lisp/gnus/ChangeLog.2 +++ b/lisp/gnus/ChangeLog.2 @@ -6088,7 +6088,7 @@ (nntp-retrieve-groups): Ditto for groups. (nntp-retrieve-articles): Ditto for articles. (*): Replaced nntp-possibly-change-group calls to - nntp-with-open-group forms in all, but one, occurrance. + nntp-with-open-group forms in all, but one, occurrence. (nntp-accept-process-output): Bug fix. Detect when called with null process. diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1 index 8d17f06c036..bf90d0dce40 100644 --- a/lisp/mh-e/ChangeLog.1 +++ b/lisp/mh-e/ChangeLog.1 @@ -3499,7 +3499,7 @@ 2003-05-08 Satyaki Das - * mh-seq.el (mh-translate-range): Take into account differnt + * mh-seq.el (mh-translate-range): Take into account different semantics of split-string in Emacs and XEmacs. (mh-read-pick-regexp, mh-narrow-to-from, mh-narrow-to-cc) (mh-narrow-to-to, mh-narrow-to-header-field) diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index d39c4a6adb7..6c37667c3f6 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -1901,7 +1901,7 @@ both ends." ((equal char ?\C-g) (keyboard-quit)) ((member char '(?o ?O)) - ;; Select a differnt macro + ;; Select a different macro (let* ((nc (reftex-index-select-phrases-macro 2)) (macro-data (cdr (assoc nc reftex-index-phrases-macro-data))) diff --git a/src/ChangeLog b/src/ChangeLog index 9fbf1841982..f530a8d904e 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -114,7 +114,7 @@ (x_set_title): Remove commet about EXPLICIT. Call ns_set_name_internal. (ns_set_name_as_filename): Encode name with ENCODE_UTF_8. Always use buffer name for title and buffer filename only for - RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). + RepresentedFilename. Handle bad UTF-8 in buffer name (Bug#7517). 2011-01-03 Eli Zaretskii @@ -264,7 +264,7 @@ * gtkutil.c (menubar_map_cb): New function (Bug#7425). (xg_update_frame_menubar): Connect signal map to menubar_map_cb. - Use 23 as menubar height if 0. (Bug#7425). + Use 23 as menubar height if 0. (Bug#7425). 2010-11-14 Jan Djärv @@ -488,7 +488,7 @@ is more portable. * keyboard.c (gobble_input): Move call of xd_read_queued_messages ... - (kbd_buffer_get_event): ... here. This is needed for cygwin, which + (kbd_buffer_get_event): ... here. This is needed for cygwin, which has not defined SIGIO. 2010-09-27 Michael Albinus @@ -685,7 +685,7 @@ * nsterm.m (ns_draw_fringe_bitmap): Likewise. * fringe.c (draw_fringe_bitmap_1): Don't clip bitmap here. - Take account of bitmap offset. + Take account of bitmap offset. (draw_window_fringes): Take account of window vscroll. (update_window_fringes): Likewise. Extend top-aligned top indicator or bottom-aligned bottom indicator to adjacent rows if it doesn't fit -- cgit v1.3 From cb191a14ce7507c5131c36625e34f462180f4c33 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 12 Feb 2011 04:47:28 -0500 Subject: Fix bug #7840 with setting terminal/keyboard encoding of emacsclient frames. terminal.c (create_terminal): Use default-keyboard-coding-system and default-terminal-coding-system to initialize coding systems of the new terminal. --- src/ChangeLog | 6 ++++++ src/terminal.c | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/ChangeLog b/src/ChangeLog index f530a8d904e..b90a9c02e8b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-02-12 Eli Zaretskii + + * terminal.c (create_terminal): Use default-keyboard-coding-system + and default-terminal-coding-system to initialize coding systems of + the new terminal. (Bug#7840) + 2011-02-09 Martin Rudalics * window.c (select_window): Check inhibit_point_swap argument when diff --git a/src/terminal.c b/src/terminal.c index 041dc28f977..a51a18c934d 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -226,6 +226,7 @@ struct terminal * create_terminal (void) { struct terminal *terminal = allocate_terminal (); + Lisp_Object terminal_coding, keyboard_coding; terminal->name = NULL; terminal->next_terminal = terminal_list; @@ -238,8 +239,22 @@ create_terminal (void) terminal->terminal_coding = (struct coding_system *) xmalloc (sizeof (struct coding_system)); - setup_coding_system (Qno_conversion, terminal->keyboard_coding); - setup_coding_system (Qundecided, terminal->terminal_coding); + /* If default coding systems for the terminal and the keyboard are + already defined, use them in preference to the defaults. This is + needed when Emacs runs in daemon mode. */ + keyboard_coding = SYMBOL_VALUE (intern ("default-keyboard-coding-system")); + if (NILP (keyboard_coding) + || EQ (keyboard_coding, Qunbound) + || NILP (Fcoding_system_p (keyboard_coding))) + keyboard_coding = Qno_conversion; + terminal_coding = SYMBOL_VALUE (intern ("default-terminal-coding-system")); + if (NILP (terminal_coding) + || EQ (terminal_coding, Qunbound) + || NILP (Fcoding_system_p (terminal_coding))) + terminal_coding = Qundecided; + + setup_coding_system (keyboard_coding, terminal->keyboard_coding); + setup_coding_system (terminal_coding, terminal->terminal_coding); terminal->param_alist = Qnil; return terminal; -- cgit v1.3