diff options
| author | Stefan Monnier | 2013-10-29 22:45:53 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2013-10-29 22:45:53 -0400 |
| commit | ae4002ce294f21a82979edacef39f82d8e4cd1cc (patch) | |
| tree | d0f2e23db27b13aeb9066c534661f04032fb36d8 /src | |
| parent | 53b39e8977941c6b60deeeca3c0e54da9ec7961a (diff) | |
| download | emacs-ae4002ce294f21a82979edacef39f82d8e4cd1cc.tar.gz emacs-ae4002ce294f21a82979edacef39f82d8e4cd1cc.zip | |
Cleanup namespace of dos-w32.el.
* lisp/dos-w32.el (minibuffer-history-case-insensitive-variables)
(path-separator, null-device, buffer-file-coding-system)
(lpr-headers-switches): Check system-type before modifying them.
(find-buffer-file-type-coding-system): Mark obsolete.
(w32-find-file-not-found-set-buffer-file-coding-system): Rename from
find-file-not-found-set-buffer-file-coding-system.
(w32-untranslated-filesystem-list, w32-untranslated-canonical-name):
(w32-add-untranslated-filesystem, w32-remove-untranslated-filesystem)
(w32-direct-print-region-use-command-dot-com, w32-untranslated-file-p):
(w32-direct-print-region-helper, w32-direct-print-region-function)
(w32-direct-ps-print-region-function): Rename by adding a "w32-" prefix.
* lisp/startup.el (normal-top-level-add-subdirs-to-load-path):
* lisp/ps-print.el (ps-print-region-function):
* lisp/lpr.el (print-region-function): Use new name.
* lisp/simple.el (copy-region-as-kill): Fix call to region-extract-function.
* lisp/emacs-lisp/bytecomp.el (byte-defop-compiler): Add new `2-and' handler.
(byte-compile-and-folded): New function.
(=, <, >, <=, >=): Use it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/insdel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/insdel.c b/src/insdel.c index d7b7ff05e2c..08349fffe45 100644 --- a/src/insdel.c +++ b/src/insdel.c | |||
| @@ -827,7 +827,7 @@ insert_1_both (const char *string, | |||
| 827 | 827 | ||
| 828 | eassert (GPT <= GPT_BYTE); | 828 | eassert (GPT <= GPT_BYTE); |
| 829 | 829 | ||
| 830 | /* The insert may have been in the unchanged region, so check again. */ | 830 | /* The insert may have been in the unchanged region, so check again. */ |
| 831 | if (Z - GPT < END_UNCHANGED) | 831 | if (Z - GPT < END_UNCHANGED) |
| 832 | END_UNCHANGED = Z - GPT; | 832 | END_UNCHANGED = Z - GPT; |
| 833 | 833 | ||
| @@ -956,7 +956,7 @@ insert_from_string_1 (Lisp_Object string, ptrdiff_t pos, ptrdiff_t pos_byte, | |||
| 956 | 956 | ||
| 957 | eassert (GPT <= GPT_BYTE); | 957 | eassert (GPT <= GPT_BYTE); |
| 958 | 958 | ||
| 959 | /* The insert may have been in the unchanged region, so check again. */ | 959 | /* The insert may have been in the unchanged region, so check again. */ |
| 960 | if (Z - GPT < END_UNCHANGED) | 960 | if (Z - GPT < END_UNCHANGED) |
| 961 | END_UNCHANGED = Z - GPT; | 961 | END_UNCHANGED = Z - GPT; |
| 962 | 962 | ||
| @@ -1148,7 +1148,7 @@ insert_from_buffer_1 (struct buffer *buf, | |||
| 1148 | 1148 | ||
| 1149 | eassert (GPT <= GPT_BYTE); | 1149 | eassert (GPT <= GPT_BYTE); |
| 1150 | 1150 | ||
| 1151 | /* The insert may have been in the unchanged region, so check again. */ | 1151 | /* The insert may have been in the unchanged region, so check again. */ |
| 1152 | if (Z - GPT < END_UNCHANGED) | 1152 | if (Z - GPT < END_UNCHANGED) |
| 1153 | END_UNCHANGED = Z - GPT; | 1153 | END_UNCHANGED = Z - GPT; |
| 1154 | 1154 | ||