summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-06-02 10:03:49 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-06-02 10:03:49 -0700
commit7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f (patch)
tree2f37e5c7fc676e32e7eeec3ac6a351af8dd3e338
parent63810350ec7f26232fbd653f279c92f43b5c4807 (diff)
downloademacs-7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f.tar.gz
* minibuf.c (Fassoc_string): Remove duplicate declaration.
-rw-r--r--src/ChangeLog2
-rw-r--r--src/minibuf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 82ff4123b18..e5fddec94a4 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
2012-06-02 Paul Eggert <eggert@cs.ucla.edu>
+ * minibuf.c (Fassoc_string): Remove duplicate declaration.
+
* sysdep.c (system_process_attributes) [SOLARIS2 && HAVE_PROCFS]:
Convert pctcpu and pctmem to Lisp float properly.
Let the compiler fold better, as 100.0/0x8000 is exact.
diff --git a/src/minibuf.c b/src/minibuf.c
index e9bc36303f9..d921e80be48 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1726,8 +1726,6 @@ See also `completing-read-function'. */)
return Ffuncall (9, args);
}
-Lisp_Object Fassoc_string (register Lisp_Object key, Lisp_Object list, Lisp_Object case_fold);
-
/* Test whether TXT is an exact completion. */
DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
doc: /* Return non-nil if STRING is a valid completion.