aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2011-02-09 21:07:32 -0800
committerGlenn Morris2011-02-09 21:07:32 -0800
commit86361e1edcf4ae6a602a32ee32dba16a3470f407 (patch)
tree22e398efb877ced58c62669f763d0644ec589103
parentdc4c6a7add965cbe7d0b9a357f9403defa96c0da (diff)
downloademacs-86361e1edcf4ae6a602a32ee32dba16a3470f407.tar.gz
emacs-86361e1edcf4ae6a602a32ee32dba16a3470f407.zip
cl-seq.el doc fixes.
* lisp/emacs-lisp/cl-seq.el (union, nunion, intersection) (nintersection, set-difference, nset-difference) (set-exclusive-or, nset-exclusive-or): Doc fix.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/cl-seq.el16
2 files changed, 12 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7d460219db0..852a73735f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12011-02-10 Glenn Morris <rgm@gnu.org> 12011-02-10 Glenn Morris <rgm@gnu.org>
2 2
3 * emacs-lisp/cl-seq.el (union, nunion, intersection)
4 (nintersection, set-difference, nset-difference)
5 (set-exclusive-or, nset-exclusive-or): Doc fix.
6
3 * ediff-ptch.el (ediff-fixup-patch-map): Doc fix. 7 * ediff-ptch.el (ediff-fixup-patch-map): Doc fix.
4 8
52011-02-08 Glenn Morris <rgm@gnu.org> 92011-02-08 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index cb1730eff73..250110528d9 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -772,7 +772,7 @@ Return the sublist of LIST whose car matches.
772;;;###autoload 772;;;###autoload
773(defun union (cl-list1 cl-list2 &rest cl-keys) 773(defun union (cl-list1 cl-list2 &rest cl-keys)
774 "Combine LIST1 and LIST2 using a set-union operation. 774 "Combine LIST1 and LIST2 using a set-union operation.
775The result list contains all items that appear in either LIST1 or LIST2. 775The resulting list contains all items that appear in either LIST1 or LIST2.
776This is a non-destructive function; it makes a copy of the data if necessary 776This is a non-destructive function; it makes a copy of the data if necessary
777to avoid corrupting the original LIST1 and LIST2. 777to avoid corrupting the original LIST1 and LIST2.
778\nKeywords supported: :test :test-not :key 778\nKeywords supported: :test :test-not :key
@@ -793,7 +793,7 @@ to avoid corrupting the original LIST1 and LIST2.
793;;;###autoload 793;;;###autoload
794(defun nunion (cl-list1 cl-list2 &rest cl-keys) 794(defun nunion (cl-list1 cl-list2 &rest cl-keys)
795 "Combine LIST1 and LIST2 using a set-union operation. 795 "Combine LIST1 and LIST2 using a set-union operation.
796The result list contains all items that appear in either LIST1 or LIST2. 796The resulting list contains all items that appear in either LIST1 or LIST2.
797This is a destructive function; it reuses the storage of LIST1 and LIST2 797This is a destructive function; it reuses the storage of LIST1 and LIST2
798whenever possible. 798whenever possible.
799\nKeywords supported: :test :test-not :key 799\nKeywords supported: :test :test-not :key
@@ -804,7 +804,7 @@ whenever possible.
804;;;###autoload 804;;;###autoload
805(defun intersection (cl-list1 cl-list2 &rest cl-keys) 805(defun intersection (cl-list1 cl-list2 &rest cl-keys)
806 "Combine LIST1 and LIST2 using a set-intersection operation. 806 "Combine LIST1 and LIST2 using a set-intersection operation.
807The result list contains all items that appear in both LIST1 and LIST2. 807The resulting list contains all items that appear in both LIST1 and LIST2.
808This is a non-destructive function; it makes a copy of the data if necessary 808This is a non-destructive function; it makes a copy of the data if necessary
809to avoid corrupting the original LIST1 and LIST2. 809to avoid corrupting the original LIST1 and LIST2.
810\nKeywords supported: :test :test-not :key 810\nKeywords supported: :test :test-not :key
@@ -827,7 +827,7 @@ to avoid corrupting the original LIST1 and LIST2.
827;;;###autoload 827;;;###autoload
828(defun nintersection (cl-list1 cl-list2 &rest cl-keys) 828(defun nintersection (cl-list1 cl-list2 &rest cl-keys)
829 "Combine LIST1 and LIST2 using a set-intersection operation. 829 "Combine LIST1 and LIST2 using a set-intersection operation.
830The result list contains all items that appear in both LIST1 and LIST2. 830The resulting list contains all items that appear in both LIST1 and LIST2.
831This is a destructive function; it reuses the storage of LIST1 and LIST2 831This is a destructive function; it reuses the storage of LIST1 and LIST2
832whenever possible. 832whenever possible.
833\nKeywords supported: :test :test-not :key 833\nKeywords supported: :test :test-not :key
@@ -837,7 +837,7 @@ whenever possible.
837;;;###autoload 837;;;###autoload
838(defun set-difference (cl-list1 cl-list2 &rest cl-keys) 838(defun set-difference (cl-list1 cl-list2 &rest cl-keys)
839 "Combine LIST1 and LIST2 using a set-difference operation. 839 "Combine LIST1 and LIST2 using a set-difference operation.
840The result list contains all items that appear in LIST1 but not LIST2. 840The resulting list contains all items that appear in LIST1 but not LIST2.
841This is a non-destructive function; it makes a copy of the data if necessary 841This is a non-destructive function; it makes a copy of the data if necessary
842to avoid corrupting the original LIST1 and LIST2. 842to avoid corrupting the original LIST1 and LIST2.
843\nKeywords supported: :test :test-not :key 843\nKeywords supported: :test :test-not :key
@@ -857,7 +857,7 @@ to avoid corrupting the original LIST1 and LIST2.
857;;;###autoload 857;;;###autoload
858(defun nset-difference (cl-list1 cl-list2 &rest cl-keys) 858(defun nset-difference (cl-list1 cl-list2 &rest cl-keys)
859 "Combine LIST1 and LIST2 using a set-difference operation. 859 "Combine LIST1 and LIST2 using a set-difference operation.
860The result list contains all items that appear in LIST1 but not LIST2. 860The resulting list contains all items that appear in LIST1 but not LIST2.
861This is a destructive function; it reuses the storage of LIST1 and LIST2 861This is a destructive function; it reuses the storage of LIST1 and LIST2
862whenever possible. 862whenever possible.
863\nKeywords supported: :test :test-not :key 863\nKeywords supported: :test :test-not :key
@@ -868,7 +868,7 @@ whenever possible.
868;;;###autoload 868;;;###autoload
869(defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys) 869(defun set-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
870 "Combine LIST1 and LIST2 using a set-exclusive-or operation. 870 "Combine LIST1 and LIST2 using a set-exclusive-or operation.
871The result list contains all items that appear in exactly one of LIST1, LIST2. 871The resulting list contains all items appearing in exactly one of LIST1, LIST2.
872This is a non-destructive function; it makes a copy of the data if necessary 872This is a non-destructive function; it makes a copy of the data if necessary
873to avoid corrupting the original LIST1 and LIST2. 873to avoid corrupting the original LIST1 and LIST2.
874\nKeywords supported: :test :test-not :key 874\nKeywords supported: :test :test-not :key
@@ -881,7 +881,7 @@ to avoid corrupting the original LIST1 and LIST2.
881;;;###autoload 881;;;###autoload
882(defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys) 882(defun nset-exclusive-or (cl-list1 cl-list2 &rest cl-keys)
883 "Combine LIST1 and LIST2 using a set-exclusive-or operation. 883 "Combine LIST1 and LIST2 using a set-exclusive-or operation.
884The result list contains all items that appear in exactly one of LIST1, LIST2. 884The resulting list contains all items appearing in exactly one of LIST1, LIST2.
885This is a destructive function; it reuses the storage of LIST1 and LIST2 885This is a destructive function; it reuses the storage of LIST1 and LIST2
886whenever possible. 886whenever possible.
887\nKeywords supported: :test :test-not :key 887\nKeywords supported: :test :test-not :key