Mercurial > emacs
comparison src/window.c @ 11003:71304a70d0f6
(Fdisplay_buffer): Fix prev change--return selected window.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 14 Mar 1995 18:39:58 +0000 |
| parents | c0d821d95739 |
| children | e88e9a016cfa |
comparison
equal
deleted
inserted
replaced
| 11002:ff115809a39e | 11003:71304a70d0f6 |
|---|---|
| 1886 in the selected window. */ | 1886 in the selected window. */ |
| 1887 if (NILP (not_this_window)) | 1887 if (NILP (not_this_window)) |
| 1888 { | 1888 { |
| 1889 tem = Fmember (XBUFFER (buffer)->name, Vsame_window_buffer_names); | 1889 tem = Fmember (XBUFFER (buffer)->name, Vsame_window_buffer_names); |
| 1890 if (!NILP (tem)) | 1890 if (!NILP (tem)) |
| 1891 return Fswitch_to_buffer (buffer, Qnil); | 1891 { |
| 1892 Fswitch_to_buffer (buffer, Qnil); | |
| 1893 return selected_window; | |
| 1894 } | |
| 1892 | 1895 |
| 1893 tem = Fassoc (XBUFFER (buffer)->name, Vsame_window_buffer_names); | 1896 tem = Fassoc (XBUFFER (buffer)->name, Vsame_window_buffer_names); |
| 1894 if (!NILP (tem)) | 1897 if (!NILP (tem)) |
| 1895 return Fswitch_to_buffer (buffer, Qnil); | 1898 { |
| 1899 Fswitch_to_buffer (buffer, Qnil); | |
| 1900 return selected_window; | |
| 1901 } | |
| 1896 | 1902 |
| 1897 for (tem = Vsame_window_regexps; CONSP (tem); tem = XCONS (tem)->cdr) | 1903 for (tem = Vsame_window_regexps; CONSP (tem); tem = XCONS (tem)->cdr) |
| 1898 { | 1904 { |
| 1899 Lisp_Object car = XCONS (tem)->car; | 1905 Lisp_Object car = XCONS (tem)->car; |
| 1900 if (STRINGP (car) | 1906 if (STRINGP (car) |
| 1901 && fast_string_match (car, XBUFFER (buffer)->name) >= 0) | 1907 && fast_string_match (car, XBUFFER (buffer)->name) >= 0) |
| 1902 return Fswitch_to_buffer (buffer, Qnil); | 1908 { |
| 1909 Fswitch_to_buffer (buffer, Qnil); | |
| 1910 return selected_window; | |
| 1911 } | |
| 1903 else if (CONSP (car) | 1912 else if (CONSP (car) |
| 1904 && STRINGP (XCONS (car)->car) | 1913 && STRINGP (XCONS (car)->car) |
| 1905 && fast_string_match (XCONS (car)->car, | 1914 && fast_string_match (XCONS (car)->car, |
| 1906 XBUFFER (buffer)->name) >= 0) | 1915 XBUFFER (buffer)->name) >= 0) |
| 1907 return Fswitch_to_buffer (buffer, Qnil); | 1916 { |
| 1917 Fswitch_to_buffer (buffer, Qnil); | |
| 1918 return selected_window; | |
| 1919 } | |
| 1908 } | 1920 } |
| 1909 } | 1921 } |
| 1910 | 1922 |
| 1911 #ifdef MULTI_FRAME | 1923 #ifdef MULTI_FRAME |
| 1912 /* If pop_up_frames, | 1924 /* If pop_up_frames, |