aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuanma Barranquero2011-02-28 05:24:40 +0100
committerJuanma Barranquero2011-02-28 05:24:40 +0100
commitca3afb79d0530a7f100e40d263cf9a3912f597b8 (patch)
tree7caafe2f3f7bfb50dc43d2a97302f84c881e16e6
parent2cf429d01c073a5d6fb4cb3d0a73ae80eb95947c (diff)
downloademacs-ca3afb79d0530a7f100e40d263cf9a3912f597b8.tar.gz
emacs-ca3afb79d0530a7f100e40d263cf9a3912f597b8.zip
lisp/emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1): Fix typos in docstrings.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/pcase.el10
2 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a7201a5c399..4fe7b7883f3 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-02-28 Juanma Barranquero <lekktu@gmail.com>
2
3 * emacs-lisp/pcase.el (pcase, pcase--u1, pcase--q1):
4 Fix typos in docstrings.
5
12011-02-28 Stephen Berman <stephen.berman@gmx.net> 62011-02-28 Stephen Berman <stephen.berman@gmx.net>
2 7
3 * dired-aux.el (dired-update-file-line): 8 * dired-aux.el (dired-update-file-line):
diff --git a/lisp/emacs-lisp/pcase.el b/lisp/emacs-lisp/pcase.el
index 0d5fd99db5d..916dcd4785c 100644
--- a/lisp/emacs-lisp/pcase.el
+++ b/lisp/emacs-lisp/pcase.el
@@ -3,7 +3,7 @@
3;; Copyright (C) 2010-2011 Free Software Foundation, Inc. 3;; Copyright (C) 2010-2011 Free Software Foundation, Inc.
4 4
5;; Author: Stefan Monnier <monnier@iro.umontreal.ca> 5;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
6;; Keywords: 6;; Keywords:
7 7
8;; This file is part of GNU Emacs. 8;; This file is part of GNU Emacs.
9 9
@@ -75,12 +75,12 @@ If a SYMBOL is used twice in the same pattern (i.e. the pattern is
75QPatterns can take the following forms: 75QPatterns can take the following forms:
76 (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr. 76 (QPAT1 . QPAT2) matches if QPAT1 matches the car and QPAT2 the cdr.
77 ,UPAT matches if the UPattern UPAT matches. 77 ,UPAT matches if the UPattern UPAT matches.
78 STRING matches if the object is `equal' to STRING. 78 STRING matches if the object is `equal' to STRING.
79 ATOM matches if the object is `eq' to ATOM. 79 ATOM matches if the object is `eq' to ATOM.
80QPatterns for vectors are not implemented yet. 80QPatterns for vectors are not implemented yet.
81 81
82PRED can take the form 82PRED can take the form
83 FUNCTION in which case it gets called with one argument. 83 FUNCTION in which case it gets called with one argument.
84 (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments. 84 (FUN ARG1 .. ARGN) in which case it gets called with N+1 arguments.
85A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION). 85A PRED of the form FUNCTION is equivalent to one of the form (FUNCTION).
86PRED patterns can refer to variables bound earlier in the pattern. 86PRED patterns can refer to variables bound earlier in the pattern.
@@ -439,7 +439,7 @@ MATCH is the pattern that needs to be matched, of the form:
439;; bootstrapping problems. 439;; bootstrapping problems.
440(defun pcase--u1 (matches code vars rest) 440(defun pcase--u1 (matches code vars rest)
441 "Return code that runs CODE (with VARS) if MATCHES match. 441 "Return code that runs CODE (with VARS) if MATCHES match.
442and otherwise defers to REST which is a list of branches of the form 442Otherwise, it defers to REST which is a list of branches of the form
443\(ELSE-MATCH ELSE-CODE . ELSE-VARS)." 443\(ELSE-MATCH ELSE-CODE . ELSE-VARS)."
444 ;; Depending on the order in which we choose to check each of the MATCHES, 444 ;; Depending on the order in which we choose to check each of the MATCHES,
445 ;; the resulting tree may be smaller or bigger. So in general, we'd want 445 ;; the resulting tree may be smaller or bigger. So in general, we'd want
@@ -591,7 +591,7 @@ and otherwise defers to REST which is a list of branches of the form
591 591
592(defun pcase--q1 (sym qpat matches code vars rest) 592(defun pcase--q1 (sym qpat matches code vars rest)
593 "Return code that runs CODE if SYM matches QPAT and if MATCHES match. 593 "Return code that runs CODE if SYM matches QPAT and if MATCHES match.
594and if not, defers to REST which is a list of branches of the form 594Otherwise, it defers to REST which is a list of branches of the form
595\(OTHER_MATCH OTHER-CODE . OTHER-VARS)." 595\(OTHER_MATCH OTHER-CODE . OTHER-VARS)."
596 (cond 596 (cond
597 ((eq (car-safe qpat) '\,) (error "Can't use `,UPATTERN")) 597 ((eq (car-safe qpat) '\,) (error "Can't use `,UPATTERN"))