Changeset 4079 for trunk/lisp/subr.el

Timestamp:

05/13/06 11:31:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/subr.el (modified) (2 diffs)

trunk/lisp/subr.el

@@ -1123 +1123 @@
-                                (< oa ob)
-                              oa)))))))
+
+(defun add-to-history (history-var newelt &optional maxelt)
+  "Add NEWELT to the history list stored in the variable HISTORY-VAR.
+Return the new history list.
+If MAXELT is non-nil, it specifies the maximum length of the history.
+Otherwise, the maximum history length is the value of the `history-length'
+property on symbol HISTORY-VAR, if set, or the value of the `history-length'
+variable.
+Remove duplicates of NEWELT unless `history-delete-duplicates' is nil."
+  (unless maxelt
+    (setq maxelt (or (get history-var 'history-length)
+                     history-length)))
+  (let ((history (symbol-value history-var))
+        tail)
+    (if history-delete-duplicates
+        (setq history (delete newelt history)))
+    (setq history (cons newelt history))
+    (when (integerp maxelt)
+      (if (= 0 maxelt)
+          (setq history nil)
+        (setq tail (nthcdr (1- maxelt) history))
+        (when (consp tail)
+          (setcdr tail nil))))
+    (set history-var history)))
+
-
-;;;; Mode hooks.
@@ -1932 +1957 @@
-  (memq object '(nil t)))
-
+(defun field-at-pos (pos)
+  "Return the field at position POS, taking stickiness etc into account"
+  (let ((raw-field (get-char-property (field-beginning pos) 'field)))
+    (if (eq raw-field 'boundary)
+        (get-char-property (1- (field-end pos)) 'field)
+      raw-field)))
+
-
-;;;; Support for yanking and text properties.