diff options
| author | Glenn Morris | 2019-03-01 09:40:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-03-01 09:40:22 -0800 |
| commit | 3c1407cedf9787605cf6c8ea6071bc97acb169b4 (patch) | |
| tree | 4718edd369ef5f4cf5f0c8c6ab6e8a67b8d862ec /src | |
| parent | 7e29eae023c8158d41eba02c2367e70cbee53642 (diff) | |
| parent | dee3cdc50415a3fa45c6b043590d99adf47c7c69 (diff) | |
| download | emacs-3c1407cedf9787605cf6c8ea6071bc97acb169b4.tar.gz emacs-3c1407cedf9787605cf6c8ea6071bc97acb169b4.zip | |
Merge from origin/emacs-26
dee3cdc Minor improvement for docs of completion
c86d419 ; * src/image.c (imagemagick_load, svg_load): Fix typos in co...
6d46fa9 Disable the timerfd interface on Cygwin
3707ea4 Fix a typo in the doc string of 'regex-opt'
d9905d5 Document bash 5.0.0 misbehavior in tramp.texi (Bug#34192)
# Conflicts:
# doc/misc/tramp.texi
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/image.c b/src/image.c index 642bf671520..854fbe40f75 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -9079,8 +9079,8 @@ imagemagick_load (struct frame *f, struct image *img) | |||
| 9079 | #endif | 9079 | #endif |
| 9080 | success_p = imagemagick_load_image (f, img, 0, 0, SSDATA (file)); | 9080 | success_p = imagemagick_load_image (f, img, 0, 0, SSDATA (file)); |
| 9081 | } | 9081 | } |
| 9082 | /* Else its not a file, its a lisp object. Load the image from a | 9082 | /* Else it's not a file, it's a Lisp object. Load the image from a |
| 9083 | lisp object rather than a file. */ | 9083 | Lisp object rather than a file. */ |
| 9084 | else | 9084 | else |
| 9085 | { | 9085 | { |
| 9086 | Lisp_Object data; | 9086 | Lisp_Object data; |
| @@ -9388,8 +9388,8 @@ svg_load (struct frame *f, struct image *img) | |||
| 9388 | SSDATA (ENCODE_FILE (file))); | 9388 | SSDATA (ENCODE_FILE (file))); |
| 9389 | xfree (contents); | 9389 | xfree (contents); |
| 9390 | } | 9390 | } |
| 9391 | /* Else its not a file, its a lisp object. Load the image from a | 9391 | /* Else it's not a file, it's a Lisp object. Load the image from a |
| 9392 | lisp object rather than a file. */ | 9392 | Lisp object rather than a file. */ |
| 9393 | else | 9393 | else |
| 9394 | { | 9394 | { |
| 9395 | Lisp_Object data, original_filename; | 9395 | Lisp_Object data, original_filename; |