Changeset 4169 for trunk/lisp/simple.el

Timestamp:

09/30/06 09:12:06 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp (modified) (1 prop)
• trunk/lisp/simple.el (modified) (12 diffs)

trunk/lisp/simple.el

@@ -129 +129 @@
-  :version "22.1")
-
-1
+5
-  "*Highlighting of locations in selected source buffers.
-If number, highlight the locus in `next-error' face for given time in seconds.
@@ -142 +142 @@
-  :version "22.1")
-
-1
-non-selected source buffers
+5
+`next-error-no-select'
-If number, highlight the locus in `next-error' face for given time in seconds.
-If t, highlight the locus indefinitely until some other locus replaces it.
@@ -2660 +2660 @@
-(defcustom yank-excluded-properties
-  '(read-only invisible intangible field mouse-face help-echo local-map keymap
-
+ fontified
-  "*Text properties to discard when yanking.
-The value should be a list of text properties to discard or t,
@@ -3497 +3497 @@
-                (<= ypos (- (frame-char-height))))
-        (unless lh
-
-
-
-
-
+
+
+
-        (cond
-         ;; If last line of window is fully visible, move forward.
@@ -3508 +3506 @@
-         ;; If cursor is not in the bottom scroll margin, move forward.
-         ((and (> vpos 0)
-
-
-
+
+
+
+
+
-                  (min (- (window-text-height) scroll-margin 1) (1- vpos))))
-          nil)
@@ -3560 +3560 @@
-  (let ((inhibit-point-motion-hooks t)
-        (opoint (point))
-forward (> arg 0)
+orig-arg arg
-    (unwind-protect
-        (progn
@@ -3593 +3593 @@
-                            nil)))
-            ;; Move by arg lines, but ignore invisible ones.
-
+ line-end
-              (while (and (> arg 0) (not done))
-                ;; If the following character is currently invisible,
@@ -3599 +3599 @@
-                (while (and (not (eobp)) (line-move-invisible-p (point)))
-                  (goto-char (next-char-property-change (point))))
-
-
+
+
+
+
+
+
-                ;; If there's no invisibility here, move over the newline.
-                (cond
@@ -3658 +3662 @@
-            (t
-             (line-move-finish (or goal-column temporary-goal-column)
-forward
+(> orig-arg 0)
-
-(defun line-move-finish (column opoint forward)
@@ -3667 +3671 @@
-
-      (let (new
+            (old (point))
-            (line-beg (save-excursion (beginning-of-line) (point)))
-            (line-end
@@ -3681 +3686 @@
-        ;; Move to the desired column.
-        (line-move-to-column column)
+
+        ;; Corner case: suppose we start out in a field boundary in
+        ;; the middle of a continued line.  When we get to
+        ;; line-move-finish, point is at the start of a new *screen*
+        ;; line but the same text line; then line-move-to-column would
+        ;; move us backwards. Test using C-n with point on the "x" in
+        ;;   (insert "a" (propertize "x" 'field t) (make-string 89 ?y))
+        (and forward
+             (< (point) old)
+             (goto-char old))
+
-        (setq new (point))
-
@@ -3720 +3736 @@
-        (let ((inhibit-point-motion-hooks nil))
-          (goto-char
-
-
+
+
+
+
+
+
+
+
+
-
-        ;; If all this moved us to a different line,