diff options
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-util.el | 6 |
3 files changed, 21 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 571013e3244..4e94a4e3f23 100644 --- a/Makefile.in +++ b/Makefile.in @@ -281,6 +281,19 @@ all: ${SUBDIR} .PHONY: all ${SUBDIR} blessmail epaths-force FRC +help:: + $(info ) + $(info make all Compile and build Emacs.) + $(info make install Install Emacs.) + $(info make TAGS Update tags tables.) + $(info ) + $(info make clean Delete files created by building Emacs.) + $(info make distclean Delete all files created by building or configuring.) + $(info make maintainer-clean Like distclean, but delete more files: *.elc, etc.) + $(info make extra-clean Like maintainer-clean, but delete backups and autosaves.) + $(info ) + $(info make bootstrap Compile and build from a clean state.) + removenullpaths=sed -e 's/^://g' -e 's/:$$//g' -e 's/::/:/g' # Generate epaths.h from epaths.in. This target is invoked by `configure'. diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 62665654654..279db5ee3e4 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -1,3 +1,8 @@ +2012-09-29 Bastien Guerry <bzg@gnu.org> + + * url-util.el (url-insert-entities-in-string) + (url-build-query-string): Fix docstrings. + 2012-09-25 Chong Yidong <cyd@gnu.org> * url-parse.el (url-recreate-url-attributes): diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index 4761f71ad8f..038b7fcf7fe 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -132,8 +132,8 @@ If a list, it is a list of the types of messages to be logged." (defun url-insert-entities-in-string (string) "Convert HTML markup-start characters to entity references in STRING. Also replaces the \" character, so that the result may be safely used as - an attribute value in a tag. Returns a new string with the result of the - conversion. Replaces these characters as follows: +an attribute value in a tag. Returns a new string with the result of the +conversion. Replaces these characters as follows: & ==> & < ==> < > ==> > @@ -294,7 +294,7 @@ Given a QUERY in the form: (key2 val2) (key3 val1 val2) (key4) - (key5 "")) + (key5 \"\")) \(This is the same format as produced by `url-parse-query-string') |