diff options
| author | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2012-08-28 22:44:20 +0900 |
| commit | 4eb4de01df384be9b8d811f7ab476eeb37ece748 (patch) | |
| tree | d04f0dae31dd8b533a0c3cd738430841ce7ebb84 /src/textprop.c | |
| parent | fabc1281e9cde34ff9a19d843316d2ceca8647ad (diff) | |
| parent | 4f2daf31078e2cc059710e129dffe0beed8fc7c2 (diff) | |
| download | emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.tar.gz emacs-4eb4de01df384be9b8d811f7ab476eeb37ece748.zip | |
merge 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 | ||