[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103245: Merge changes from emacs-23
|
From: |
Chong Yidong |
|
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103245: Merge changes from emacs-23 branch |
|
Date: |
Sat, 12 Feb 2011 19:16:28 -0500 |
|
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103245 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-12 19:16:28 -0500
message:
Merge changes from emacs-23 branch
modified:
doc/misc/ChangeLog
doc/misc/sc.texi
doc/misc/url.texi
etc/ChangeLog
lisp/ChangeLog
lisp/dired.el
lisp/emacs-lisp/checkdoc.el
lisp/emacs-lisp/cl-loaddefs.el
lisp/emacs-lisp/cl-seq.el
lisp/emulation/cua-base.el
lisp/faces.el
lisp/gnus/ChangeLog.2
lisp/mh-e/ChangeLog.1
lisp/simple.el
lisp/textmodes/reftex-index.el
lisp/vc/ediff-mult.el
lisp/vc/ediff-ptch.el
src/ChangeLog
src/nsterm.m
src/window.c
=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog 2011-02-09 01:40:01 +0000
+++ b/doc/misc/ChangeLog 2011-02-12 23:40:43 +0000
@@ -1,3 +1,11 @@
+2011-02-12 Glenn Morris <address@hidden>
+
+ * sc.texi (Getting Connected): Remove old index entries.
+
+2011-02-12 Ulrich Mueller <address@hidden>
+
+ * url.texi: Remove duplicate @dircategory (Bug#7942).
+
2011-02-09 Paul Eggert <address@hidden>
* texinfo.tex: Update to version 2011-02-07.16.
=== modified file 'doc/misc/sc.texi'
--- a/doc/misc/sc.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/sc.texi 2011-02-12 23:40:43 +0000
@@ -751,8 +751,6 @@
@cindex .emacs file
@findex sc-cite-original
@findex cite-original (sc-)
address@hidden sc-submit-bug-report
address@hidden submit-bug-report (sc-)
The first thing that everyone should do, regardless of the MUA you are
using is to set up Emacs so it will load Supercite at the appropriate
time. This happens automatically if Supercite is distributed with your
=== modified file 'doc/misc/url.texi'
--- a/doc/misc/url.texi 2011-01-25 04:08:28 +0000
+++ b/doc/misc/url.texi 2011-02-12 23:40:43 +0000
@@ -12,7 +12,6 @@
\overfullrule=0pt
%\global\baselineskip 30pt % for printing in double space
@end tex
address@hidden World Wide Web
@dircategory Emacs
@direntry
* URL: (url). URL loading package.
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2011-02-12 23:10:18 +0000
+++ b/etc/ChangeLog 2011-02-12 23:40:43 +0000
@@ -386,7 +386,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 <address@hidden>
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-02-12 22:55:28 +0000
+++ b/lisp/ChangeLog 2011-02-12 23:40:43 +0000
@@ -1,3 +1,20 @@
+2011-02-10 Glenn Morris <address@hidden>
+
+ * emacs-lisp/cl-seq.el (union, nunion, intersection)
+ (nintersection, set-difference, nset-difference)
+ (set-exclusive-or, nset-exclusive-or): Doc fix.
+
+ * ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
+
+2011-02-08 Glenn Morris <address@hidden>
+
+ * faces.el (face-attr-match-p): Handle the obsolete :bold and
+ :italic props, so that frame-set-background-mode works. (Bug#7966)
+
+2011-02-07 Glenn Morris <address@hidden>
+
+ * simple.el (next-error): Doc fix.
+
2011-02-12 Thierry Volpiatto <address@hidden>
* dired-aux.el (dired-create-files): Adapt destination name to
@@ -1651,7 +1668,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.
@@ -4145,7 +4162,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)
@@ -4156,9 +4173,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-24 Wilson Snyder <address@hidden>
@@ -4174,7 +4191,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)
@@ -4185,7 +4202,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
@@ -4193,7 +4210,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)
@@ -4225,7 +4242,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)
=== modified file 'lisp/dired.el'
--- a/lisp/dired.el 2011-02-02 16:21:52 +0000
+++ b/lisp/dired.el 2011-02-13 00:16:28 +0000
@@ -3570,7 +3570,7 @@
;;;;;; dired-run-shell-command dired-do-shell-command
dired-do-async-shell-command
;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown
;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories
dired-backup-diff
-;;;;;; dired-diff) "dired-aux" "dired-aux.el"
"9f5fc434fa6c2607b6e66060862c9caf")
+;;;;;; dired-diff) "dired-aux" "dired-aux.el"
"e66465bcd1687d66cfb1202c9963d567")
;;; Generated autoloads from dired-aux.el
(autoload 'dired-diff "dired-aux" "\
=== modified file 'lisp/emacs-lisp/checkdoc.el'
--- a/lisp/emacs-lisp/checkdoc.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/checkdoc.el 2011-02-12 23:40:43 +0000
@@ -1797,7 +1797,7 @@
(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))
=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el 2011-02-08 06:54:37 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el 2011-02-13 00:16:28 +0000
@@ -754,7 +754,7 @@
;;;;;; find nsubstitute-if-not nsubstitute-if nsubstitute substitute-if-not
;;;;;; substitute-if substitute delete-duplicates remove-duplicates
;;;;;; delete-if-not delete-if delete* remove-if-not remove-if remove*
-;;;;;; replace fill reduce) "cl-seq" "cl-seq.el"
"43e0c1183e738e1e1038cdd84fde8366")
+;;;;;; replace fill reduce) "cl-seq" "cl-seq.el"
"df375ddc313f0c1c262cacab5cffd3e4")
;;; Generated autoloads from cl-seq.el
(autoload 'reduce "cl-seq" "\
@@ -1080,7 +1080,7 @@
(autoload 'union "cl-seq" "\
Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
@@ -1090,7 +1090,7 @@
(autoload 'nunion "cl-seq" "\
Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
@@ -1100,7 +1100,7 @@
(autoload 'intersection "cl-seq" "\
Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
@@ -1110,7 +1110,7 @@
(autoload 'nintersection "cl-seq" "\
Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
@@ -1120,7 +1120,7 @@
(autoload 'set-difference "cl-seq" "\
Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
@@ -1130,7 +1130,7 @@
(autoload 'nset-difference "cl-seq" "\
Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
@@ -1140,7 +1140,7 @@
(autoload 'set-exclusive-or "cl-seq" "\
Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
@@ -1150,7 +1150,7 @@
(autoload 'nset-exclusive-or "cl-seq" "\
Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
=== modified file 'lisp/emacs-lisp/cl-seq.el'
--- a/lisp/emacs-lisp/cl-seq.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/cl-seq.el 2011-02-12 23:40:43 +0000
@@ -770,7 +770,7 @@
;;;###autoload
(defun union (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
\nKeywords supported: :test :test-not :key
@@ -791,7 +791,7 @@
;;;###autoload
(defun nunion (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-union operation.
-The result list contains all items that appear in either LIST1 or LIST2.
+The resulting list contains all items that appear in either LIST1 or LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
\nKeywords supported: :test :test-not :key
@@ -802,7 +802,7 @@
;;;###autoload
(defun intersection (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
\nKeywords supported: :test :test-not :key
@@ -825,7 +825,7 @@
;;;###autoload
(defun nintersection (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-intersection operation.
-The result list contains all items that appear in both LIST1 and LIST2.
+The resulting list contains all items that appear in both LIST1 and LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
\nKeywords supported: :test :test-not :key
@@ -835,7 +835,7 @@
;;;###autoload
(defun set-difference (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
\nKeywords supported: :test :test-not :key
@@ -855,7 +855,7 @@
;;;###autoload
(defun nset-difference (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-difference operation.
-The result list contains all items that appear in LIST1 but not LIST2.
+The resulting list contains all items that appear in LIST1 but not LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
\nKeywords supported: :test :test-not :key
@@ -866,7 +866,7 @@
;;;###autoload
(defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
This is a non-destructive function; it makes a copy of the data if necessary
to avoid corrupting the original LIST1 and LIST2.
\nKeywords supported: :test :test-not :key
@@ -879,7 +879,7 @@
;;;###autoload
(defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
"Combine LIST1 and LIST2 using a set-exclusive-or operation.
-The result list contains all items that appear in exactly one of LIST1, LIST2.
+The resulting list contains all items appearing in exactly one of LIST1, LIST2.
This is a destructive function; it reuses the storage of LIST1 and LIST2
whenever possible.
\nKeywords supported: :test :test-not :key
=== modified file 'lisp/emulation/cua-base.el'
--- a/lisp/emulation/cua-base.el 2011-01-25 04:08:28 +0000
+++ b/lisp/emulation/cua-base.el 2011-02-12 23:40:43 +0000
@@ -246,7 +246,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).
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2011-02-05 22:30:14 +0000
+++ b/lisp/faces.el 2011-02-12 23:40:43 +0000
@@ -1577,13 +1577,25 @@
is used. If nil or omitted, use the selected frame."
(unless frame
(setq frame (selected-frame)))
- (let ((list face-attribute-name-alist)
- (match t))
+ (let* ((list face-attribute-name-alist)
+ (match t)
+ (bold (and (plist-member attrs :bold)
+ (not (plist-member attrs :weight))))
+ (italic (and (plist-member attrs :italic)
+ (not (plist-member attrs :slant))))
+ (plist (if (or bold italic)
+ (copy-sequence attrs)
+ attrs)))
+ ;; Handle the Emacs 20 :bold and :italic properties.
+ (if bold
+ (plist-put plist :weight (if bold 'bold 'normal)))
+ (if italic
+ (plist-put plist :slant (if italic 'italic 'normal)))
(while (and match list)
(let* ((attr (caar list))
(specified-value
- (if (plist-member attrs attr)
- (plist-get attrs attr)
+ (if (plist-member plist attr)
+ (plist-get plist attr)
'unspecified))
(value-now (face-attribute face attr frame)))
(setq match (equal specified-value value-now))
=== modified file 'lisp/gnus/ChangeLog.2'
--- a/lisp/gnus/ChangeLog.2 2011-01-26 08:36:39 +0000
+++ b/lisp/gnus/ChangeLog.2 2011-02-12 23:40:43 +0000
@@ -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.
=== modified file 'lisp/mh-e/ChangeLog.1'
--- a/lisp/mh-e/ChangeLog.1 2011-01-26 08:36:39 +0000
+++ b/lisp/mh-e/ChangeLog.1 2011-02-12 23:40:43 +0000
@@ -3499,7 +3499,7 @@
2003-05-08 Satyaki Das <address@hidden>
- * 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)
=== modified file 'lisp/simple.el'
--- a/lisp/simple.el 2011-02-11 18:25:06 +0000
+++ b/lisp/simple.el 2011-02-12 23:40:43 +0000
@@ -304,8 +304,8 @@
until you use it in some other buffer which uses Compilation mode
or Compilation Minor mode.
-See variables `compilation-parse-errors-function' and
-\`compilation-error-regexp-alist' for customization ideas."
+To control which errors are matched, customize the variable
+`compilation-error-regexp-alist'."
(interactive "P")
(if (consp arg) (setq reset t arg nil))
(when (setq next-error-last-buffer (next-error-find-buffer))
=== modified file 'lisp/textmodes/reftex-index.el'
--- a/lisp/textmodes/reftex-index.el 2011-01-25 04:08:28 +0000
+++ b/lisp/textmodes/reftex-index.el 2011-02-12 23:40:43 +0000
@@ -1957,7 +1957,7 @@
((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)))
=== modified file 'lisp/vc/ediff-mult.el'
--- a/lisp/vc/ediff-mult.el 2011-01-25 04:08:28 +0000
+++ b/lisp/vc/ediff-mult.el 2011-02-12 23:40:43 +0000
@@ -306,7 +306,7 @@
(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)))
=== modified file 'lisp/vc/ediff-ptch.el'
--- a/lisp/vc/ediff-ptch.el 2011-01-26 08:36:39 +0000
+++ b/lisp/vc/ediff-ptch.el 2011-02-12 23:40:43 +0000
@@ -417,7 +417,7 @@
are two possible targets for applying the patch.
Both files seem to be plausible alternatives.
-Please advice:
+Please advise:
Type `y' to use %s as the target;
Type `n' to use %s as the target.
"
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2011-02-12 22:36:22 +0000
+++ b/src/ChangeLog 2011-02-13 00:16:28 +0000
@@ -1,3 +1,20 @@
+2011-02-12 Martin Rudalics <address@hidden>
+
+ * window.c (select_window): Check inhibit_point_swap argument when
+ deciding whether to return immediately.
+
+2011-02-12 Jan Djärv <address@hidden>
+
+ * nsterm.m (setFrame, initFrame): Make sure pixel_height doesn't become
+ zero (Bug#7348).
+
+2011-02-12 Chong Yidong <address@hidden>
+
+ * config.in (TERMINFO): New definition.
+
+ * s/netbsd.h: Use it to choose between terminfo and termcap
+ (Bug#7642).
+
2011-02-12 Paul Eggert <address@hidden>
* md5.c (md5_process_bytes): Use sizeof, not __alignof__.
@@ -1610,7 +1627,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-26 Eli Zaretskii <address@hidden>
@@ -2617,7 +2634,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-10-08 Chong Yidong <address@hidden>
=== modified file 'src/nsterm.m'
--- a/src/nsterm.m 2011-01-25 04:08:28 +0000
+++ b/src/nsterm.m 2011-02-12 23:40:43 +0000
@@ -5783,6 +5783,7 @@
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);
@@ -5812,6 +5813,7 @@
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];
=== modified file 'src/window.c'
--- a/src/window.c 2011-02-05 22:30:14 +0000
+++ b/src/window.c 2011-02-12 23:40:43 +0000
@@ -3517,7 +3517,7 @@
record_buffer (w->buffer);
}
- if (EQ (window, selected_window))
+ if (EQ (window, selected_window) && !inhibit_point_swap)
return window;
sf = SELECTED_FRAME ();
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103245: Merge changes from emacs-23 branch,
Chong Yidong <=