diff options
| author | Tom Tromey | 2012-09-04 10:10:06 -0600 |
|---|---|---|
| committer | Tom Tromey | 2012-09-04 10:10:06 -0600 |
| commit | bf69f522a9e135f9aa483cedd53e71e915f2bf75 (patch) | |
| tree | 3f73c47fb863ef87f420de1d30858da821072bd9 /src/textprop.c | |
| parent | 303324a9232dbc89369faceb6b3530740d0fc1bd (diff) | |
| parent | 6ec9a5a7b5efb129807f567709ca858211ed7840 (diff) | |
| download | emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.tar.gz emacs-bf69f522a9e135f9aa483cedd53e71e915f2bf75.zip | |
merge from trunk
Diffstat (limited to 'src/textprop.c')
| -rw-r--r-- | src/textprop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/textprop.c b/src/textprop.c index 20d98b0e6f3..b6895fc426a 100644 --- a/src/textprop.c +++ b/src/textprop.c | |||
| @@ -760,7 +760,7 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT. */) | |||
| 760 | 760 | ||
| 761 | if (BUFFERP (object) && current_buffer != XBUFFER (object)) | 761 | if (BUFFERP (object) && current_buffer != XBUFFER (object)) |
| 762 | { | 762 | { |
| 763 | record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); | 763 | record_unwind_current_buffer (); |
| 764 | Fset_buffer (object); | 764 | Fset_buffer (object); |
| 765 | } | 765 | } |
| 766 | 766 | ||
| @@ -843,7 +843,7 @@ position LIMIT; return LIMIT if nothing is found before reaching LIMIT. */) | |||
| 843 | 843 | ||
| 844 | if (BUFFERP (object) && current_buffer != XBUFFER (object)) | 844 | if (BUFFERP (object) && current_buffer != XBUFFER (object)) |
| 845 | { | 845 | { |
| 846 | record_unwind_protect (Fset_buffer, Fcurrent_buffer ()); | 846 | record_unwind_current_buffer (); |
| 847 | Fset_buffer (object); | 847 | Fset_buffer (object); |
| 848 | } | 848 | } |
| 849 | 849 | ||