; Fix typos
This commit is contained in:
parent
43c7e05a2a
commit
9292f595a7
22 changed files with 36 additions and 36 deletions
|
@ -4302,7 +4302,7 @@
|
||||||
(install-arch-indep): Don't install-etc for self-contained ns builds.
|
(install-arch-indep): Don't install-etc for self-contained ns builds.
|
||||||
|
|
||||||
* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
|
* configure.in (GCC_TEST_OPTIONS, NON_GCC_TEST_OPTIONS) <darwin>:
|
||||||
No longer unconditonally add /sw directories. (Bug#2280)
|
No longer unconditionally add /sw directories. (Bug#2280)
|
||||||
|
|
||||||
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
|
* Makefile.in (install-arch-dep): Depend on install-arch-indep.
|
||||||
(install-arch-indep): Depend on install-leim.
|
(install-arch-indep): Depend on install-leim.
|
||||||
|
|
|
@ -11843,7 +11843,7 @@
|
||||||
|
|
||||||
2016-01-05 Alan Mackenzie <acm@muc.de>
|
2016-01-05 Alan Mackenzie <acm@muc.de>
|
||||||
|
|
||||||
Make C++ buffers writeable when writing their initial text properties.
|
Make C++ buffers writable when writing their initial text properties.
|
||||||
|
|
||||||
This is a correction to yesterday's CC Mode patch.
|
This is a correction to yesterday's CC Mode patch.
|
||||||
|
|
||||||
|
|
20
ChangeLog.3
20
ChangeLog.3
|
@ -10733,7 +10733,7 @@
|
||||||
|
|
||||||
Bump lisp/progmodes/project.el version to 0.7.1
|
Bump lisp/progmodes/project.el version to 0.7.1
|
||||||
|
|
||||||
Amont other things exposes the new project-buffers generic function to
|
Among other things exposes the new project-buffers generic function to
|
||||||
ELPA users.
|
ELPA users.
|
||||||
|
|
||||||
* lisp/progmodes/project.el (Version): Bump to 0.7.1
|
* lisp/progmodes/project.el (Version): Bump to 0.7.1
|
||||||
|
@ -25218,7 +25218,7 @@
|
||||||
|
|
||||||
2021-05-12 Richard Stallman <rms@gnu.org>
|
2021-05-12 Richard Stallman <rms@gnu.org>
|
||||||
|
|
||||||
Little improvements in rmail.el. Recognize encryped override headers.
|
Little improvements in rmail.el. Recognize encrypted override headers.
|
||||||
|
|
||||||
* lisp/mail/rmail.el (rmail-simplified-subject): Delete `[External] :'.
|
* lisp/mail/rmail.el (rmail-simplified-subject): Delete `[External] :'.
|
||||||
(rmail-reply): In encrypted message, search for other header fields
|
(rmail-reply): In encrypted message, search for other header fields
|
||||||
|
@ -27333,7 +27333,7 @@
|
||||||
|
|
||||||
2021-04-24 Glenn Morris <rgm@gnu.org>
|
2021-04-24 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
Simlify top-level Makefile since admin is always included
|
Simplify top-level Makefile since admin is always included
|
||||||
|
|
||||||
* Makefile.in (clean_dirs, distclean_dirs, maintainer_clean_dirs):
|
* Makefile.in (clean_dirs, distclean_dirs, maintainer_clean_dirs):
|
||||||
Add admin directories.
|
Add admin directories.
|
||||||
|
@ -27668,7 +27668,7 @@
|
||||||
* lisp/international/mule-cmds.el (ucs-names):
|
* lisp/international/mule-cmds.el (ucs-names):
|
||||||
* lisp/progmodes/ebrowse.el (ebrowse-read):
|
* lisp/progmodes/ebrowse.el (ebrowse-read):
|
||||||
* test/src/coding-tests.el (benchmark-decoder): Avoid lowering
|
* test/src/coding-tests.el (benchmark-decoder): Avoid lowering
|
||||||
gc-cons-treshold.
|
gc-cons-threshold.
|
||||||
|
|
||||||
2021-04-22 Stefan Kangas <stefan@marxist.se>
|
2021-04-22 Stefan Kangas <stefan@marxist.se>
|
||||||
|
|
||||||
|
@ -46569,7 +46569,7 @@
|
||||||
Fix syntax of symbol and punctuation characters
|
Fix syntax of symbol and punctuation characters
|
||||||
|
|
||||||
* lisp/international/characters.el: Adjust syntax of punctuation
|
* lisp/international/characters.el: Adjust syntax of punctuation
|
||||||
and symbol charcaters to follow that of Unicode properties.
|
and symbol characters to follow that of Unicode properties.
|
||||||
(Bug#44974)
|
(Bug#44974)
|
||||||
|
|
||||||
2021-01-02 Andrea Corallo <akrl@sdf.org>
|
2021-01-02 Andrea Corallo <akrl@sdf.org>
|
||||||
|
@ -63457,9 +63457,9 @@
|
||||||
|
|
||||||
2020-09-30 Lars Ingebrigtsen <larsi@gnus.org>
|
2020-09-30 Lars Ingebrigtsen <larsi@gnus.org>
|
||||||
|
|
||||||
Fix isearch-group-* colors on low-colour displays
|
Fix isearch-group-* colors on low-color displays
|
||||||
|
|
||||||
* lisp/isearch.el (isearch-group-1): On low-colour displays, just
|
* lisp/isearch.el (isearch-group-1): On low-color displays, just
|
||||||
use the normal isearch color (bug#43702).
|
use the normal isearch color (bug#43702).
|
||||||
(isearch-group-2 etc): Ditto.
|
(isearch-group-2 etc): Ditto.
|
||||||
|
|
||||||
|
@ -123828,7 +123828,7 @@
|
||||||
|
|
||||||
* doc/lispref/text.texi (Special Properties): For the hook property
|
* doc/lispref/text.texi (Special Properties): For the hook property
|
||||||
modification-hooks, state that inhibit-modification-hooks is NOT bound to
|
modification-hooks, state that inhibit-modification-hooks is NOT bound to
|
||||||
non-nil when calling its functions. For the hooks insert-in-fron-hooks and
|
non-nil when calling its functions. For the hooks insert-in-front-hooks and
|
||||||
insert-behind-hooks, state that that variable does get bound to non-nil.
|
insert-behind-hooks, state that that variable does get bound to non-nil.
|
||||||
|
|
||||||
2019-06-24 Hong Xu <hong@topbug.net>
|
2019-06-24 Hong Xu <hong@topbug.net>
|
||||||
|
@ -156545,7 +156545,7 @@
|
||||||
Obsolete Flymake's flymake-diagnostic-types-alist
|
Obsolete Flymake's flymake-diagnostic-types-alist
|
||||||
|
|
||||||
That variable was an association between symbols and properties,
|
That variable was an association between symbols and properties,
|
||||||
effecively duplicating symbol's property lists. It is simpler to just
|
effectively duplicating symbol's property lists. It is simpler to just
|
||||||
put properties on symbols. Backward compatibility to the old variable
|
put properties on symbols. Backward compatibility to the old variable
|
||||||
has been kept.
|
has been kept.
|
||||||
|
|
||||||
|
@ -190693,7 +190693,7 @@
|
||||||
Support multi-lingual detection of SEE ALSO man sections
|
Support multi-lingual detection of SEE ALSO man sections
|
||||||
|
|
||||||
* lisp/man.el (Man-see-also-regexp): Add support for SEE ALSO
|
* lisp/man.el (Man-see-also-regexp): Add support for SEE ALSO
|
||||||
section detection in several langages: French, German, Spanish,
|
section detection in several languages: French, German, Spanish,
|
||||||
Portuguese, Italian, Polish, Turkish, Japanese, Chinese. (Bug#28142)
|
Portuguese, Italian, Polish, Turkish, Japanese, Chinese. (Bug#28142)
|
||||||
|
|
||||||
2017-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
2017-08-26 Paul Eggert <eggert@cs.ucla.edu>
|
||||||
|
|
|
@ -240,7 +240,7 @@
|
||||||
the comment node.
|
the comment node.
|
||||||
</p>
|
</p>
|
||||||
</dd>
|
</dd>
|
||||||
<dt id='index-coment_002dstart_002dskip'><span><code>coment-start-skip</code><a href='#index-coment_002dstart_002dskip' class='copiable-anchor'> ¶</a></span></dt>
|
<dt id='index-coment_002dstart_002dskip'><span><code>comment-start-skip</code><a href='#index-coment_002dstart_002dskip' class='copiable-anchor'> ¶</a></span></dt>
|
||||||
<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
|
<dd><p>This anchor is a function that is called with 3 arguments: <var>node</var>,
|
||||||
<var>parent</var>, and <var>bol</var>, and returns the position after the
|
<var>parent</var>, and <var>bol</var>, and returns the position after the
|
||||||
comment-start token and any whitespace characters following that
|
comment-start token and any whitespace characters following that
|
||||||
|
|
|
@ -2201,7 +2201,7 @@
|
||||||
* doclicense.texi: Update to latest version from FSF.
|
* doclicense.texi: Update to latest version from FSF.
|
||||||
These are just minor editorial changes.
|
These are just minor editorial changes.
|
||||||
* elisp.texi (GNU Free Documentation License)
|
* elisp.texi (GNU Free Documentation License)
|
||||||
(GNU General Public Licens):
|
(GNU General Public License):
|
||||||
Provide sectioning, since doclicense.texi no longer does that.
|
Provide sectioning, since doclicense.texi no longer does that.
|
||||||
|
|
||||||
* loading.texi (Named Features): @ -> @@ to fix typo.
|
* loading.texi (Named Features): @ -> @@ to fix typo.
|
||||||
|
|
|
@ -10968,8 +10968,8 @@
|
||||||
* comint.el (comint-history-isearch-end):
|
* comint.el (comint-history-isearch-end):
|
||||||
Use `isearch-search-fun-default'.
|
Use `isearch-search-fun-default'.
|
||||||
(comint-history-isearch-search): Use `isearch-search-fun-default'
|
(comint-history-isearch-search): Use `isearch-search-fun-default'
|
||||||
and remove spacial case for `isearch-word'.
|
and remove special case for `isearch-word'.
|
||||||
(comint-history-isearch-wrap): Remove spacial case for
|
(comint-history-isearch-wrap): Remove special case for
|
||||||
`isearch-word'.
|
`isearch-word'.
|
||||||
|
|
||||||
* hexl.el (hexl-isearch-search-function):
|
* hexl.el (hexl-isearch-search-function):
|
||||||
|
@ -10982,13 +10982,13 @@
|
||||||
Use `isearch-search-fun-default'.
|
Use `isearch-search-fun-default'.
|
||||||
|
|
||||||
* simple.el (minibuffer-history-isearch-search):
|
* simple.el (minibuffer-history-isearch-search):
|
||||||
Use `isearch-search-fun-default' and remove spacial case for
|
Use `isearch-search-fun-default' and remove special case for
|
||||||
`isearch-word'.
|
`isearch-word'.
|
||||||
(minibuffer-history-isearch-wrap): Remove spacial case for
|
(minibuffer-history-isearch-wrap): Remove special case for
|
||||||
`isearch-word'.
|
`isearch-word'.
|
||||||
|
|
||||||
* textmodes/reftex-global.el (reftex-isearch-wrap-function):
|
* textmodes/reftex-global.el (reftex-isearch-wrap-function):
|
||||||
Remove spacial case for `isearch-word'.
|
Remove special case for `isearch-word'.
|
||||||
(reftex-isearch-isearch-search): Use `isearch-search-fun-default'.
|
(reftex-isearch-isearch-search): Use `isearch-search-fun-default'.
|
||||||
|
|
||||||
2012-05-28 Agustín Martín Domingo <agustin.martin@hispalinux.es>
|
2012-05-28 Agustín Martín Domingo <agustin.martin@hispalinux.es>
|
||||||
|
|
|
@ -15465,7 +15465,7 @@
|
||||||
2013-12-12 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
2013-12-12 Fabián Ezequiel Gallina <fgallina@gnu.org>
|
||||||
|
|
||||||
* progmodes/python.el (python-indent-context)
|
* progmodes/python.el (python-indent-context)
|
||||||
(python-indent-calculate-indentation): Fix auto-identation
|
(python-indent-calculate-indentation): Fix auto-indentation
|
||||||
behavior for comment blocks. (Bug#15916)
|
behavior for comment blocks. (Bug#15916)
|
||||||
|
|
||||||
2013-12-12 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change)
|
2013-12-12 Nathan Trapuzzano <nbtrap@nbtrap.com> (tiny change)
|
||||||
|
|
|
@ -517,7 +517,7 @@ cons cells of the form (NAME . NUM). See `sort' for more details."
|
||||||
(if (eobp) (newline num))
|
(if (eobp) (newline num))
|
||||||
(if (< x 0) (setq x 0))
|
(if (< x 0) (setq x 0))
|
||||||
(if (< y 0) (setq y 0))
|
(if (< y 0) (setq y 0))
|
||||||
;; Now, a quicky column moveto/forceto method.
|
;; Now, a quickie column moveto/forceto method.
|
||||||
(or (= (move-to-column x) x)
|
(or (= (move-to-column x) x)
|
||||||
(let ((p (point)))
|
(let ((p (point)))
|
||||||
(indent-to x)
|
(indent-to x)
|
||||||
|
|
|
@ -334,7 +334,7 @@ as the new values of the bound variables in the recursive invocation."
|
||||||
(defun string-glyph-split (string)
|
(defun string-glyph-split (string)
|
||||||
"Split STRING into a list of strings representing separate glyphs.
|
"Split STRING into a list of strings representing separate glyphs.
|
||||||
This takes into account combining characters and grapheme clusters:
|
This takes into account combining characters and grapheme clusters:
|
||||||
if compositions are enbaled, each sequence of characters composed
|
if compositions are enabled, each sequence of characters composed
|
||||||
on display into a single grapheme cluster is treated as a single
|
on display into a single grapheme cluster is treated as a single
|
||||||
indivisible unit."
|
indivisible unit."
|
||||||
(let ((result nil)
|
(let ((result nil)
|
||||||
|
|
|
@ -209,7 +209,7 @@ nil. If SIMPLE-FUNCTION is non-nil, call the function with no
|
||||||
arguments and then pass its return value to `eshell-apply-indices'.
|
arguments and then pass its return value to `eshell-apply-indices'.
|
||||||
|
|
||||||
When VALUE is a function, it's read-only by default. To make it
|
When VALUE is a function, it's read-only by default. To make it
|
||||||
writeable, use the (GET . SET) form described above. If SET is a
|
writable, use the (GET . SET) form described above. If SET is a
|
||||||
function, it takes two arguments: a list of indices (currently
|
function, it takes two arguments: a list of indices (currently
|
||||||
always nil, but reserved for future enhancement), and the new
|
always nil, but reserved for future enhancement), and the new
|
||||||
value to set.
|
value to set.
|
||||||
|
|
|
@ -8859,7 +8859,7 @@
|
||||||
signencrypt.
|
signencrypt.
|
||||||
* mml-sec.el (mml-secure-message-encrypt-pgpmime): Ditto.
|
* mml-sec.el (mml-secure-message-encrypt-pgpmime): Ditto.
|
||||||
* mml.el (mml-generate-mime-1): Change logic so a part which is
|
* mml.el (mml-generate-mime-1): Change logic so a part which is
|
||||||
both signed & encryped is processed in one operation (rather than
|
both signed & encrypted is processed in one operation (rather than
|
||||||
two separate ops: sign, then encrypt).
|
two separate ops: sign, then encrypt).
|
||||||
* mml2015.el (mml2015-gpg-extract-signature-details): Give some
|
* mml2015.el (mml2015-gpg-extract-signature-details): Give some
|
||||||
indication if a message is signed by an expired key.
|
indication if a message is signed by an expired key.
|
||||||
|
|
|
@ -17348,7 +17348,7 @@
|
||||||
* rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings):
|
* rfc2047.el (rfc2047-quote-special-characters-in-quoted-strings):
|
||||||
New function.
|
New function.
|
||||||
(rfc2047-encode-message-header, rfc2047-encode-region): Use it.
|
(rfc2047-encode-message-header, rfc2047-encode-region): Use it.
|
||||||
(rfc2047-strip-backslashes-in-quoted-strings): New fnction.
|
(rfc2047-strip-backslashes-in-quoted-strings): New function.
|
||||||
(rfc2047-decode-region): Use it; add optional argument `address-mime'.
|
(rfc2047-decode-region): Use it; add optional argument `address-mime'.
|
||||||
(rfc2047-decode-string): Ditto.
|
(rfc2047-decode-string): Ditto.
|
||||||
(rfc2047-decode-address-region): New function.
|
(rfc2047-decode-address-region): New function.
|
||||||
|
|
|
@ -2822,7 +2822,7 @@ systematically send encrypted emails when possible."
|
||||||
|
|
||||||
The value must be a list of three elements, all strings:
|
The value must be a list of three elements, all strings:
|
||||||
- Key ID, in hexadecimal form;
|
- Key ID, in hexadecimal form;
|
||||||
- Key URL or ASCII armoured key; and
|
- Key URL or ASCII armored key; and
|
||||||
- Protection preference, one of: \"unprotected\", \"sign\",
|
- Protection preference, one of: \"unprotected\", \"sign\",
|
||||||
\"encrypt\" or \"signencrypt\".
|
\"encrypt\" or \"signencrypt\".
|
||||||
|
|
||||||
|
|
|
@ -761,7 +761,7 @@
|
||||||
below, docstring was usually completely rewritten. Use "on"
|
below, docstring was usually completely rewritten. Use "on"
|
||||||
instead of "t" in docstring to match what is seen in customization
|
instead of "t" in docstring to match what is seen in customization
|
||||||
buffer. Use headline capitalization. Standardize on "Auto-detect"
|
buffer. Use headline capitalization. Standardize on "Auto-detect"
|
||||||
text when option has that capibility.
|
text when option has that capability.
|
||||||
(mh): Since we work on more than one type of Emacs, use Emacs
|
(mh): Since we work on more than one type of Emacs, use Emacs
|
||||||
instead of GNU Emacs. Prefer GNU mailutils over GNU Mailutils.
|
instead of GNU Emacs. Prefer GNU mailutils over GNU Mailutils.
|
||||||
(mh-variant): s/Autodetect at startup/Auto-detect/.
|
(mh-variant): s/Autodetect at startup/Auto-detect/.
|
||||||
|
|
|
@ -95,7 +95,7 @@ This variable becomes local to a buffer when set in any fashion for it.
|
||||||
It is better to use the function of the same name to change the behavior of
|
It is better to use the function of the same name to change the behavior of
|
||||||
directory tracking in an rlogin session once it has begun, rather than
|
directory tracking in an rlogin session once it has begun, rather than
|
||||||
simply setting this variable, since the function does the necessary
|
simply setting this variable, since the function does the necessary
|
||||||
re-synching of directories."
|
re-syncing of directories."
|
||||||
:type '(choice (const :tag "off" nil)
|
:type '(choice (const :tag "off" nil)
|
||||||
(const :tag "ftp" t)
|
(const :tag "ftp" t)
|
||||||
(other :tag "local" local))
|
(other :tag "local" local))
|
||||||
|
|
|
@ -1700,7 +1700,7 @@ Expansion occurs in a temporary Org mode buffer."
|
||||||
(condition-case error
|
(condition-case error
|
||||||
(insert-file-contents filename)
|
(insert-file-contents filename)
|
||||||
(error
|
(error
|
||||||
(insert (format "%%![couldn not insert %s: %s]"
|
(insert (format "%%![could not insert %s: %s]"
|
||||||
filename
|
filename
|
||||||
error))))))))
|
error))))))))
|
||||||
;; Mark %() embedded elisp for later evaluation.
|
;; Mark %() embedded elisp for later evaluation.
|
||||||
|
|
|
@ -5299,7 +5299,7 @@ indentation removed from its contents."
|
||||||
;; mechanism is robust enough to preserve total order among elements
|
;; mechanism is robust enough to preserve total order among elements
|
||||||
;; even when the tree is only partially synchronized.
|
;; even when the tree is only partially synchronized.
|
||||||
;;
|
;;
|
||||||
;; The cache code debuggin is fairly complex because cache request
|
;; The cache code debugging is fairly complex because cache request
|
||||||
;; state is often hard to reproduce. An extensive diagnostics
|
;; state is often hard to reproduce. An extensive diagnostics
|
||||||
;; functionality is built into the cache code to assist hunting bugs.
|
;; functionality is built into the cache code to assist hunting bugs.
|
||||||
;; See `org-element--cache-self-verify', `org-element--cache-self-verify-frequency',
|
;; See `org-element--cache-self-verify', `org-element--cache-self-verify-frequency',
|
||||||
|
|
|
@ -1192,7 +1192,7 @@ fontified."
|
||||||
"Check whether NODE is a variable.
|
"Check whether NODE is a variable.
|
||||||
NODE's type should be \"identifier\"."
|
NODE's type should be \"identifier\"."
|
||||||
;; An identifier can be a function/class name, a property, or a
|
;; An identifier can be a function/class name, a property, or a
|
||||||
;; variables. This funtion filters out function/class names and
|
;; variables. This function filters out function/class names and
|
||||||
;; properties.
|
;; properties.
|
||||||
(pcase (treesit-node-type (treesit-node-parent node))
|
(pcase (treesit-node-type (treesit-node-parent node))
|
||||||
((or "function_definition" "class_definition") nil)
|
((or "function_definition" "class_definition") nil)
|
||||||
|
|
|
@ -4093,7 +4093,7 @@ move point to the beginning of buffer. Return the new location of point."
|
||||||
(interactive)
|
(interactive)
|
||||||
(beginning-of-line)
|
(beginning-of-line)
|
||||||
;; `bibtex-any-valid-entry-type' would fail if users "disable"
|
;; `bibtex-any-valid-entry-type' would fail if users "disable"
|
||||||
;; an entry by chosing an invalid entry type.
|
;; an entry by choosing an invalid entry type.
|
||||||
(or (looking-at bibtex-any-entry-maybe-empty-head)
|
(or (looking-at bibtex-any-entry-maybe-empty-head)
|
||||||
(re-search-backward bibtex-any-entry-maybe-empty-head nil 'move))
|
(re-search-backward bibtex-any-entry-maybe-empty-head nil 'move))
|
||||||
(point))
|
(point))
|
||||||
|
|
|
@ -1623,7 +1623,7 @@ BACKWARD and ALL are the same as in `treesit-search-forward'."
|
||||||
;; TODO: I'm not entirely sure how would this go, so I only documented
|
;; TODO: I'm not entirely sure how would this go, so I only documented
|
||||||
;; the "defun" functions and didn't document any "thing" functions.
|
;; the "defun" functions and didn't document any "thing" functions.
|
||||||
;; We should also document `treesit-block-type-regexp' and support it
|
;; We should also document `treesit-block-type-regexp' and support it
|
||||||
;; in major modes if we can meaningfully intergrate hideshow: I tried
|
;; in major modes if we can meaningfully integrate hideshow: I tried
|
||||||
;; and failed, we need SomeOne that understands hideshow to look at
|
;; and failed, we need SomeOne that understands hideshow to look at
|
||||||
;; it. (BTW, hideshow should use its own
|
;; it. (BTW, hideshow should use its own
|
||||||
;; `treesit-hideshow-block-type-regexp'.)
|
;; `treesit-hideshow-block-type-regexp'.)
|
||||||
|
@ -2617,7 +2617,7 @@ window."
|
||||||
(defvar treesit-language-source-alist nil
|
(defvar treesit-language-source-alist nil
|
||||||
"Configuration for downloading and installing tree-sitter language grammars.
|
"Configuration for downloading and installing tree-sitter language grammars.
|
||||||
|
|
||||||
The value should be an alist where each elemnt has the form
|
The value should be an alist where each element has the form
|
||||||
|
|
||||||
(LANG . (URL SOURCE-DIR GRAMMAR-DIR CC C++))
|
(LANG . (URL SOURCE-DIR GRAMMAR-DIR CC C++))
|
||||||
|
|
||||||
|
|
|
@ -435,7 +435,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'."
|
||||||
;; Conflict
|
;; Conflict
|
||||||
(and
|
(and
|
||||||
(cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
|
(cvs-match (concat "C \\(.*" qfile "\\)$") (path 1) (type 'CONFLICT))
|
||||||
;; C might be followed by a "spurious" U for non-mergable files
|
;; C might be followed by a "spurious" U for non-mergeable files
|
||||||
(cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
|
(cvs-or (cvs-match (concat "U \\(.*" qfile "\\)$")) t))
|
||||||
;; Successful merge
|
;; Successful merge
|
||||||
(cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))
|
(cvs-match (concat "M \\(.*" qfile "\\)$") (path 1))
|
||||||
|
|
|
@ -3294,7 +3294,7 @@
|
||||||
2010-10-09 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
2010-10-09 Lars Magne Ingebrigtsen <larsi@gnus.org>
|
||||||
|
|
||||||
* gnutls.c (syms_of_gnutls): All the bootprops are keywords.
|
* gnutls.c (syms_of_gnutls): All the bootprops are keywords.
|
||||||
(emacs_gnutls_write): Remove the debuggin fsync call.
|
(emacs_gnutls_write): Remove the debugging fsync call.
|
||||||
(emacs_gnutls_read): Return -1 if we got an error from
|
(emacs_gnutls_read): Return -1 if we got an error from
|
||||||
gnutls_read. This allows us to actually read lots of data from
|
gnutls_read. This allows us to actually read lots of data from
|
||||||
the GnuTLS stream.
|
the GnuTLS stream.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue