diff options
| author | Paul Eggert | 2012-06-02 10:03:49 -0700 |
|---|---|---|
| committer | Paul Eggert | 2012-06-02 10:03:49 -0700 |
| commit | 7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f (patch) | |
| tree | 2f37e5c7fc676e32e7eeec3ac6a351af8dd3e338 /src | |
| parent | 63810350ec7f26232fbd653f279c92f43b5c4807 (diff) | |
| download | emacs-7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f.tar.gz emacs-7bd5c1f4a4abb97576a26d6b0a9691c5f530d99f.zip | |
* minibuf.c (Fassoc_string): Remove duplicate declaration.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/minibuf.c | 2 |
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 @@ | |||
| 1 | 2012-06-02 Paul Eggert <eggert@cs.ucla.edu> | 1 | 2012-06-02 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 2 | ||
| 3 | * minibuf.c (Fassoc_string): Remove duplicate declaration. | ||
| 4 | |||
| 3 | * sysdep.c (system_process_attributes) [SOLARIS2 && HAVE_PROCFS]: | 5 | * sysdep.c (system_process_attributes) [SOLARIS2 && HAVE_PROCFS]: |
| 4 | Convert pctcpu and pctmem to Lisp float properly. | 6 | Convert pctcpu and pctmem to Lisp float properly. |
| 5 | Let the compiler fold better, as 100.0/0x8000 is exact. | 7 | 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'. */) | |||
| 1726 | return Ffuncall (9, args); | 1726 | return Ffuncall (9, args); |
| 1727 | } | 1727 | } |
| 1728 | 1728 | ||
| 1729 | Lisp_Object Fassoc_string (register Lisp_Object key, Lisp_Object list, Lisp_Object case_fold); | ||
| 1730 | |||
| 1731 | /* Test whether TXT is an exact completion. */ | 1729 | /* Test whether TXT is an exact completion. */ |
| 1732 | DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0, | 1730 | DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0, |
| 1733 | doc: /* Return non-nil if STRING is a valid completion. | 1731 | doc: /* Return non-nil if STRING is a valid completion. |