├── .dir-locals.el ├── .ert-runner ├── .gitignore ├── .travis.yml ├── Cask ├── Changelog.org ├── LICENSE ├── README.org ├── linux-gui-restart-test.sh ├── restart-emacs.el └── test ├── restart-emacs-test.el └── test-helper.el /.dir-locals.el: -------------------------------------------------------------------------------- 1 | ((emacs-lisp-mode 2 | (compile-command . "cask exec ert-runner") 3 | (eval ignore-errors 4 | (push (quote ("Tests" "(\\(\\\\s *\\(\\(?:\\sw\\|\\s_\\)+\\)?" 2)) imenu-generic-expression)))) 5 | -------------------------------------------------------------------------------- /.ert-runner: -------------------------------------------------------------------------------- 1 | --reporter ert -------------------------------------------------------------------------------- /.gitignore: -------------------------------------------------------------------------------- 1 | .cask/ 2 | dist 3 | -------------------------------------------------------------------------------- /.travis.yml: -------------------------------------------------------------------------------- 1 | language: emacs-lisp 2 | sudo: required 3 | env: 4 | - EVM_EMACS=emacs-25.1 5 | - EVM_EMACS=emacs-24.5 6 | - EVM_EMACS=emacs-24.4 7 | - EVM_EMACS=emacs-24.3 8 | - EVM_EMACS=emacs-24.2 9 | - EVM_EMACS=emacs-24.1 10 | 11 | cache: 12 | apt: true 13 | directories: 14 | - $HOME/emacsen 15 | 16 | services: 17 | - xvfb 18 | 19 | addons: 20 | apt: 21 | packages: 22 | - python 23 | - curl 24 | - libxpm-dev 25 | - libx11-dev 26 | - libxaw7-dev 27 | - texinfo 28 | - x11-utils 29 | - xdotool 30 | 31 | before_install: 32 | - "export DISPLAY=:99.0" 33 | - sleep 3 34 | - curl -fsSkL https://raw.github.com/rejeep/evm/master/go | bash 35 | - export PATH="$HOME/.evm/bin:$PATH" 36 | - mkdir -p $HOME/emacsen 37 | - evm config path $HOME/emacsen 38 | 39 | install: 40 | - evm install $EVM_EMACS --skip 41 | - evm use $EVM_EMACS 42 | - curl -fsSL https://raw.githubusercontent.com/cask/cask/master/go | python 43 | - export PATH="/home/travis/.cask/bin:$PATH" 44 | - cask install 45 | 46 | script: 47 | - find . -name '*.elc' -delete && cask exec ert-runner 48 | - sh linux-gui-restart-test.sh 49 | 50 | notifications: 51 | email: 52 | recipients: 53 | - iqbalansari02@yahoo.com 54 | on_success: never 55 | on_failure: always 56 | -------------------------------------------------------------------------------- /Cask: -------------------------------------------------------------------------------- 1 | (source gnu) 2 | (source melpa) 3 | 4 | (package-file "restart-emacs.el") 5 | (files "*.el") 6 | 7 | (development 8 | (depends-on "f") 9 | (depends-on "ecukes") 10 | (depends-on "ert-runner") 11 | (depends-on "el-mock")) 12 | -------------------------------------------------------------------------------- /Changelog.org: -------------------------------------------------------------------------------- 1 | * v0.1.1 2 | Bugfix release fixing issues on Emacs versions older than v24.3 (and greater 3 | than v24.1) 4 | 5 | - Do not wait for output from new instance of Emacs spawned in parent Emacs 6 | - Signals `error` instead of `user-error` if the later is not available (Emacs older than v24.3) 7 | - Add tests 8 | 9 | * v0.1 10 | Initial public release 11 | -------------------------------------------------------------------------------- /LICENSE: -------------------------------------------------------------------------------- 1 | GNU GENERAL PUBLIC LICENSE 2 | Version 3, 29 June 2007 3 | 4 | Copyright (C) 2007 Free Software Foundation, Inc. 5 | Everyone is permitted to copy and distribute verbatim copies 6 | of this license document, but changing it is not allowed. 7 | 8 | Preamble 9 | 10 | The GNU General Public License is a free, copyleft license for 11 | software and other kinds of works. 12 | 13 | The licenses for most software and other practical works are designed 14 | to take away your freedom to share and change the works. By contrast, 15 | the GNU General Public License is intended to guarantee your freedom to 16 | share and change all versions of a program--to make sure it remains free 17 | software for all its users. We, the Free Software Foundation, use the 18 | GNU General Public License for most of our software; it applies also to 19 | any other work released this way by its authors. You can apply it to 20 | your programs, too. 21 | 22 | When we speak of free software, we are referring to freedom, not 23 | price. Our General Public Licenses are designed to make sure that you 24 | have the freedom to distribute copies of free software (and charge for 25 | them if you wish), that you receive source code or can get it if you 26 | want it, that you can change the software or use pieces of it in new 27 | free programs, and that you know you can do these things. 28 | 29 | To protect your rights, we need to prevent others from denying you 30 | these rights or asking you to surrender the rights. Therefore, you have 31 | certain responsibilities if you distribute copies of the software, or if 32 | you modify it: responsibilities to respect the freedom of others. 33 | 34 | For example, if you distribute copies of such a program, whether 35 | gratis or for a fee, you must pass on to the recipients the same 36 | freedoms that you received. You must make sure that they, too, receive 37 | or can get the source code. And you must show them these terms so they 38 | know their rights. 39 | 40 | Developers that use the GNU GPL protect your rights with two steps: 41 | (1) assert copyright on the software, and (2) offer you this License 42 | giving you legal permission to copy, distribute and/or modify it. 43 | 44 | For the developers' and authors' protection, the GPL clearly explains 45 | that there is no warranty for this free software. For both users' and 46 | authors' sake, the GPL requires that modified versions be marked as 47 | changed, so that their problems will not be attributed erroneously to 48 | authors of previous versions. 49 | 50 | Some devices are designed to deny users access to install or run 51 | modified versions of the software inside them, although the manufacturer 52 | can do so. This is fundamentally incompatible with the aim of 53 | protecting users' freedom to change the software. The systematic 54 | pattern of such abuse occurs in the area of products for individuals to 55 | use, which is precisely where it is most unacceptable. Therefore, we 56 | have designed this version of the GPL to prohibit the practice for those 57 | products. If such problems arise substantially in other domains, we 58 | stand ready to extend this provision to those domains in future versions 59 | of the GPL, as needed to protect the freedom of users. 60 | 61 | Finally, every program is threatened constantly by software patents. 62 | States should not allow patents to restrict development and use of 63 | software on general-purpose computers, but in those that do, we wish to 64 | avoid the special danger that patents applied to a free program could 65 | make it effectively proprietary. To prevent this, the GPL assures that 66 | patents cannot be used to render the program non-free. 67 | 68 | The precise terms and conditions for copying, distribution and 69 | modification follow. 70 | 71 | TERMS AND CONDITIONS 72 | 73 | 0. Definitions. 74 | 75 | "This License" refers to version 3 of the GNU General Public License. 76 | 77 | "Copyright" also means copyright-like laws that apply to other kinds of 78 | works, such as semiconductor masks. 79 | 80 | "The Program" refers to any copyrightable work licensed under this 81 | License. Each licensee is addressed as "you". "Licensees" and 82 | "recipients" may be individuals or organizations. 83 | 84 | To "modify" a work means to copy from or adapt all or part of the work 85 | in a fashion requiring copyright permission, other than the making of an 86 | exact copy. The resulting work is called a "modified version" of the 87 | earlier work or a work "based on" the earlier work. 88 | 89 | A "covered work" means either the unmodified Program or a work based 90 | on the Program. 91 | 92 | To "propagate" a work means to do anything with it that, without 93 | permission, would make you directly or secondarily liable for 94 | infringement under applicable copyright law, except executing it on a 95 | computer or modifying a private copy. Propagation includes copying, 96 | distribution (with or without modification), making available to the 97 | public, and in some countries other activities as well. 98 | 99 | To "convey" a work means any kind of propagation that enables other 100 | parties to make or receive copies. Mere interaction with a user through 101 | a computer network, with no transfer of a copy, is not conveying. 102 | 103 | An interactive user interface displays "Appropriate Legal Notices" 104 | to the extent that it includes a convenient and prominently visible 105 | feature that (1) displays an appropriate copyright notice, and (2) 106 | tells the user that there is no warranty for the work (except to the 107 | extent that warranties are provided), that licensees may convey the 108 | work under this License, and how to view a copy of this License. If 109 | the interface presents a list of user commands or options, such as a 110 | menu, a prominent item in the list meets this criterion. 111 | 112 | 1. Source Code. 113 | 114 | The "source code" for a work means the preferred form of the work 115 | for making modifications to it. "Object code" means any non-source 116 | form of a work. 117 | 118 | A "Standard Interface" means an interface that either is an official 119 | standard defined by a recognized standards body, or, in the case of 120 | interfaces specified for a particular programming language, one that 121 | is widely used among developers working in that language. 122 | 123 | The "System Libraries" of an executable work include anything, other 124 | than the work as a whole, that (a) is included in the normal form of 125 | packaging a Major Component, but which is not part of that Major 126 | Component, and (b) serves only to enable use of the work with that 127 | Major Component, or to implement a Standard Interface for which an 128 | implementation is available to the public in source code form. A 129 | "Major Component", in this context, means a major essential component 130 | (kernel, window system, and so on) of the specific operating system 131 | (if any) on which the executable work runs, or a compiler used to 132 | produce the work, or an object code interpreter used to run it. 133 | 134 | The "Corresponding Source" for a work in object code form means all 135 | the source code needed to generate, install, and (for an executable 136 | work) run the object code and to modify the work, including scripts to 137 | control those activities. However, it does not include the work's 138 | System Libraries, or general-purpose tools or generally available free 139 | programs which are used unmodified in performing those activities but 140 | which are not part of the work. For example, Corresponding Source 141 | includes interface definition files associated with source files for 142 | the work, and the source code for shared libraries and dynamically 143 | linked subprograms that the work is specifically designed to require, 144 | such as by intimate data communication or control flow between those 145 | subprograms and other parts of the work. 146 | 147 | The Corresponding Source need not include anything that users 148 | can regenerate automatically from other parts of the Corresponding 149 | Source. 150 | 151 | The Corresponding Source for a work in source code form is that 152 | same work. 153 | 154 | 2. Basic Permissions. 155 | 156 | All rights granted under this License are granted for the term of 157 | copyright on the Program, and are irrevocable provided the stated 158 | conditions are met. This License explicitly affirms your unlimited 159 | permission to run the unmodified Program. The output from running a 160 | covered work is covered by this License only if the output, given its 161 | content, constitutes a covered work. This License acknowledges your 162 | rights of fair use or other equivalent, as provided by copyright law. 163 | 164 | You may make, run and propagate covered works that you do not 165 | convey, without conditions so long as your license otherwise remains 166 | in force. You may convey covered works to others for the sole purpose 167 | of having them make modifications exclusively for you, or provide you 168 | with facilities for running those works, provided that you comply with 169 | the terms of this License in conveying all material for which you do 170 | not control copyright. Those thus making or running the covered works 171 | for you must do so exclusively on your behalf, under your direction 172 | and control, on terms that prohibit them from making any copies of 173 | your copyrighted material outside their relationship with you. 174 | 175 | Conveying under any other circumstances is permitted solely under 176 | the conditions stated below. Sublicensing is not allowed; section 10 177 | makes it unnecessary. 178 | 179 | 3. Protecting Users' Legal Rights From Anti-Circumvention Law. 180 | 181 | No covered work shall be deemed part of an effective technological 182 | measure under any applicable law fulfilling obligations under article 183 | 11 of the WIPO copyright treaty adopted on 20 December 1996, or 184 | similar laws prohibiting or restricting circumvention of such 185 | measures. 186 | 187 | When you convey a covered work, you waive any legal power to forbid 188 | circumvention of technological measures to the extent such circumvention 189 | is effected by exercising rights under this License with respect to 190 | the covered work, and you disclaim any intention to limit operation or 191 | modification of the work as a means of enforcing, against the work's 192 | users, your or third parties' legal rights to forbid circumvention of 193 | technological measures. 194 | 195 | 4. Conveying Verbatim Copies. 196 | 197 | You may convey verbatim copies of the Program's source code as you 198 | receive it, in any medium, provided that you conspicuously and 199 | appropriately publish on each copy an appropriate copyright notice; 200 | keep intact all notices stating that this License and any 201 | non-permissive terms added in accord with section 7 apply to the code; 202 | keep intact all notices of the absence of any warranty; and give all 203 | recipients a copy of this License along with the Program. 204 | 205 | You may charge any price or no price for each copy that you convey, 206 | and you may offer support or warranty protection for a fee. 207 | 208 | 5. Conveying Modified Source Versions. 209 | 210 | You may convey a work based on the Program, or the modifications to 211 | produce it from the Program, in the form of source code under the 212 | terms of section 4, provided that you also meet all of these conditions: 213 | 214 | a) The work must carry prominent notices stating that you modified 215 | it, and giving a relevant date. 216 | 217 | b) The work must carry prominent notices stating that it is 218 | released under this License and any conditions added under section 219 | 7. This requirement modifies the requirement in section 4 to 220 | "keep intact all notices". 221 | 222 | c) You must license the entire work, as a whole, under this 223 | License to anyone who comes into possession of a copy. This 224 | License will therefore apply, along with any applicable section 7 225 | additional terms, to the whole of the work, and all its parts, 226 | regardless of how they are packaged. This License gives no 227 | permission to license the work in any other way, but it does not 228 | invalidate such permission if you have separately received it. 229 | 230 | d) If the work has interactive user interfaces, each must display 231 | Appropriate Legal Notices; however, if the Program has interactive 232 | interfaces that do not display Appropriate Legal Notices, your 233 | work need not make them do so. 234 | 235 | A compilation of a covered work with other separate and independent 236 | works, which are not by their nature extensions of the covered work, 237 | and which are not combined with it such as to form a larger program, 238 | in or on a volume of a storage or distribution medium, is called an 239 | "aggregate" if the compilation and its resulting copyright are not 240 | used to limit the access or legal rights of the compilation's users 241 | beyond what the individual works permit. Inclusion of a covered work 242 | in an aggregate does not cause this License to apply to the other 243 | parts of the aggregate. 244 | 245 | 6. Conveying Non-Source Forms. 246 | 247 | You may convey a covered work in object code form under the terms 248 | of sections 4 and 5, provided that you also convey the 249 | machine-readable Corresponding Source under the terms of this License, 250 | in one of these ways: 251 | 252 | a) Convey the object code in, or embodied in, a physical product 253 | (including a physical distribution medium), accompanied by the 254 | Corresponding Source fixed on a durable physical medium 255 | customarily used for software interchange. 256 | 257 | b) Convey the object code in, or embodied in, a physical product 258 | (including a physical distribution medium), accompanied by a 259 | written offer, valid for at least three years and valid for as 260 | long as you offer spare parts or customer support for that product 261 | model, to give anyone who possesses the object code either (1) a 262 | copy of the Corresponding Source for all the software in the 263 | product that is covered by this License, on a durable physical 264 | medium customarily used for software interchange, for a price no 265 | more than your reasonable cost of physically performing this 266 | conveying of source, or (2) access to copy the 267 | Corresponding Source from a network server at no charge. 268 | 269 | c) Convey individual copies of the object code with a copy of the 270 | written offer to provide the Corresponding Source. This 271 | alternative is allowed only occasionally and noncommercially, and 272 | only if you received the object code with such an offer, in accord 273 | with subsection 6b. 274 | 275 | d) Convey the object code by offering access from a designated 276 | place (gratis or for a charge), and offer equivalent access to the 277 | Corresponding Source in the same way through the same place at no 278 | further charge. You need not require recipients to copy the 279 | Corresponding Source along with the object code. If the place to 280 | copy the object code is a network server, the Corresponding Source 281 | may be on a different server (operated by you or a third party) 282 | that supports equivalent copying facilities, provided you maintain 283 | clear directions next to the object code saying where to find the 284 | Corresponding Source. Regardless of what server hosts the 285 | Corresponding Source, you remain obligated to ensure that it is 286 | available for as long as needed to satisfy these requirements. 287 | 288 | e) Convey the object code using peer-to-peer transmission, provided 289 | you inform other peers where the object code and Corresponding 290 | Source of the work are being offered to the general public at no 291 | charge under subsection 6d. 292 | 293 | A separable portion of the object code, whose source code is excluded 294 | from the Corresponding Source as a System Library, need not be 295 | included in conveying the object code work. 296 | 297 | A "User Product" is either (1) a "consumer product", which means any 298 | tangible personal property which is normally used for personal, family, 299 | or household purposes, or (2) anything designed or sold for incorporation 300 | into a dwelling. In determining whether a product is a consumer product, 301 | doubtful cases shall be resolved in favor of coverage. For a particular 302 | product received by a particular user, "normally used" refers to a 303 | typical or common use of that class of product, regardless of the status 304 | of the particular user or of the way in which the particular user 305 | actually uses, or expects or is expected to use, the product. A product 306 | is a consumer product regardless of whether the product has substantial 307 | commercial, industrial or non-consumer uses, unless such uses represent 308 | the only significant mode of use of the product. 309 | 310 | "Installation Information" for a User Product means any methods, 311 | procedures, authorization keys, or other information required to install 312 | and execute modified versions of a covered work in that User Product from 313 | a modified version of its Corresponding Source. The information must 314 | suffice to ensure that the continued functioning of the modified object 315 | code is in no case prevented or interfered with solely because 316 | modification has been made. 317 | 318 | If you convey an object code work under this section in, or with, or 319 | specifically for use in, a User Product, and the conveying occurs as 320 | part of a transaction in which the right of possession and use of the 321 | User Product is transferred to the recipient in perpetuity or for a 322 | fixed term (regardless of how the transaction is characterized), the 323 | Corresponding Source conveyed under this section must be accompanied 324 | by the Installation Information. But this requirement does not apply 325 | if neither you nor any third party retains the ability to install 326 | modified object code on the User Product (for example, the work has 327 | been installed in ROM). 328 | 329 | The requirement to provide Installation Information does not include a 330 | requirement to continue to provide support service, warranty, or updates 331 | for a work that has been modified or installed by the recipient, or for 332 | the User Product in which it has been modified or installed. Access to a 333 | network may be denied when the modification itself materially and 334 | adversely affects the operation of the network or violates the rules and 335 | protocols for communication across the network. 336 | 337 | Corresponding Source conveyed, and Installation Information provided, 338 | in accord with this section must be in a format that is publicly 339 | documented (and with an implementation available to the public in 340 | source code form), and must require no special password or key for 341 | unpacking, reading or copying. 342 | 343 | 7. Additional Terms. 344 | 345 | "Additional permissions" are terms that supplement the terms of this 346 | License by making exceptions from one or more of its conditions. 347 | Additional permissions that are applicable to the entire Program shall 348 | be treated as though they were included in this License, to the extent 349 | that they are valid under applicable law. If additional permissions 350 | apply only to part of the Program, that part may be used separately 351 | under those permissions, but the entire Program remains governed by 352 | this License without regard to the additional permissions. 353 | 354 | When you convey a copy of a covered work, you may at your option 355 | remove any additional permissions from that copy, or from any part of 356 | it. (Additional permissions may be written to require their own 357 | removal in certain cases when you modify the work.) You may place 358 | additional permissions on material, added by you to a covered work, 359 | for which you have or can give appropriate copyright permission. 360 | 361 | Notwithstanding any other provision of this License, for material you 362 | add to a covered work, you may (if authorized by the copyright holders of 363 | that material) supplement the terms of this License with terms: 364 | 365 | a) Disclaiming warranty or limiting liability differently from the 366 | terms of sections 15 and 16 of this License; or 367 | 368 | b) Requiring preservation of specified reasonable legal notices or 369 | author attributions in that material or in the Appropriate Legal 370 | Notices displayed by works containing it; or 371 | 372 | c) Prohibiting misrepresentation of the origin of that material, or 373 | requiring that modified versions of such material be marked in 374 | reasonable ways as different from the original version; or 375 | 376 | d) Limiting the use for publicity purposes of names of licensors or 377 | authors of the material; or 378 | 379 | e) Declining to grant rights under trademark law for use of some 380 | trade names, trademarks, or service marks; or 381 | 382 | f) Requiring indemnification of licensors and authors of that 383 | material by anyone who conveys the material (or modified versions of 384 | it) with contractual assumptions of liability to the recipient, for 385 | any liability that these contractual assumptions directly impose on 386 | those licensors and authors. 387 | 388 | All other non-permissive additional terms are considered "further 389 | restrictions" within the meaning of section 10. If the Program as you 390 | received it, or any part of it, contains a notice stating that it is 391 | governed by this License along with a term that is a further 392 | restriction, you may remove that term. If a license document contains 393 | a further restriction but permits relicensing or conveying under this 394 | License, you may add to a covered work material governed by the terms 395 | of that license document, provided that the further restriction does 396 | not survive such relicensing or conveying. 397 | 398 | If you add terms to a covered work in accord with this section, you 399 | must place, in the relevant source files, a statement of the 400 | additional terms that apply to those files, or a notice indicating 401 | where to find the applicable terms. 402 | 403 | Additional terms, permissive or non-permissive, may be stated in the 404 | form of a separately written license, or stated as exceptions; 405 | the above requirements apply either way. 406 | 407 | 8. Termination. 408 | 409 | You may not propagate or modify a covered work except as expressly 410 | provided under this License. Any attempt otherwise to propagate or 411 | modify it is void, and will automatically terminate your rights under 412 | this License (including any patent licenses granted under the third 413 | paragraph of section 11). 414 | 415 | However, if you cease all violation of this License, then your 416 | license from a particular copyright holder is reinstated (a) 417 | provisionally, unless and until the copyright holder explicitly and 418 | finally terminates your license, and (b) permanently, if the copyright 419 | holder fails to notify you of the violation by some reasonable means 420 | prior to 60 days after the cessation. 421 | 422 | Moreover, your license from a particular copyright holder is 423 | reinstated permanently if the copyright holder notifies you of the 424 | violation by some reasonable means, this is the first time you have 425 | received notice of violation of this License (for any work) from that 426 | copyright holder, and you cure the violation prior to 30 days after 427 | your receipt of the notice. 428 | 429 | Termination of your rights under this section does not terminate the 430 | licenses of parties who have received copies or rights from you under 431 | this License. If your rights have been terminated and not permanently 432 | reinstated, you do not qualify to receive new licenses for the same 433 | material under section 10. 434 | 435 | 9. Acceptance Not Required for Having Copies. 436 | 437 | You are not required to accept this License in order to receive or 438 | run a copy of the Program. Ancillary propagation of a covered work 439 | occurring solely as a consequence of using peer-to-peer transmission 440 | to receive a copy likewise does not require acceptance. However, 441 | nothing other than this License grants you permission to propagate or 442 | modify any covered work. These actions infringe copyright if you do 443 | not accept this License. Therefore, by modifying or propagating a 444 | covered work, you indicate your acceptance of this License to do so. 445 | 446 | 10. Automatic Licensing of Downstream Recipients. 447 | 448 | Each time you convey a covered work, the recipient automatically 449 | receives a license from the original licensors, to run, modify and 450 | propagate that work, subject to this License. You are not responsible 451 | for enforcing compliance by third parties with this License. 452 | 453 | An "entity transaction" is a transaction transferring control of an 454 | organization, or substantially all assets of one, or subdividing an 455 | organization, or merging organizations. If propagation of a covered 456 | work results from an entity transaction, each party to that 457 | transaction who receives a copy of the work also receives whatever 458 | licenses to the work the party's predecessor in interest had or could 459 | give under the previous paragraph, plus a right to possession of the 460 | Corresponding Source of the work from the predecessor in interest, if 461 | the predecessor has it or can get it with reasonable efforts. 462 | 463 | You may not impose any further restrictions on the exercise of the 464 | rights granted or affirmed under this License. For example, you may 465 | not impose a license fee, royalty, or other charge for exercise of 466 | rights granted under this License, and you may not initiate litigation 467 | (including a cross-claim or counterclaim in a lawsuit) alleging that 468 | any patent claim is infringed by making, using, selling, offering for 469 | sale, or importing the Program or any portion of it. 470 | 471 | 11. Patents. 472 | 473 | A "contributor" is a copyright holder who authorizes use under this 474 | License of the Program or a work on which the Program is based. The 475 | work thus licensed is called the contributor's "contributor version". 476 | 477 | A contributor's "essential patent claims" are all patent claims 478 | owned or controlled by the contributor, whether already acquired or 479 | hereafter acquired, that would be infringed by some manner, permitted 480 | by this License, of making, using, or selling its contributor version, 481 | but do not include claims that would be infringed only as a 482 | consequence of further modification of the contributor version. For 483 | purposes of this definition, "control" includes the right to grant 484 | patent sublicenses in a manner consistent with the requirements of 485 | this License. 486 | 487 | Each contributor grants you a non-exclusive, worldwide, royalty-free 488 | patent license under the contributor's essential patent claims, to 489 | make, use, sell, offer for sale, import and otherwise run, modify and 490 | propagate the contents of its contributor version. 491 | 492 | In the following three paragraphs, a "patent license" is any express 493 | agreement or commitment, however denominated, not to enforce a patent 494 | (such as an express permission to practice a patent or covenant not to 495 | sue for patent infringement). To "grant" such a patent license to a 496 | party means to make such an agreement or commitment not to enforce a 497 | patent against the party. 498 | 499 | If you convey a covered work, knowingly relying on a patent license, 500 | and the Corresponding Source of the work is not available for anyone 501 | to copy, free of charge and under the terms of this License, through a 502 | publicly available network server or other readily accessible means, 503 | then you must either (1) cause the Corresponding Source to be so 504 | available, or (2) arrange to deprive yourself of the benefit of the 505 | patent license for this particular work, or (3) arrange, in a manner 506 | consistent with the requirements of this License, to extend the patent 507 | license to downstream recipients. "Knowingly relying" means you have 508 | actual knowledge that, but for the patent license, your conveying the 509 | covered work in a country, or your recipient's use of the covered work 510 | in a country, would infringe one or more identifiable patents in that 511 | country that you have reason to believe are valid. 512 | 513 | If, pursuant to or in connection with a single transaction or 514 | arrangement, you convey, or propagate by procuring conveyance of, a 515 | covered work, and grant a patent license to some of the parties 516 | receiving the covered work authorizing them to use, propagate, modify 517 | or convey a specific copy of the covered work, then the patent license 518 | you grant is automatically extended to all recipients of the covered 519 | work and works based on it. 520 | 521 | A patent license is "discriminatory" if it does not include within 522 | the scope of its coverage, prohibits the exercise of, or is 523 | conditioned on the non-exercise of one or more of the rights that are 524 | specifically granted under this License. You may not convey a covered 525 | work if you are a party to an arrangement with a third party that is 526 | in the business of distributing software, under which you make payment 527 | to the third party based on the extent of your activity of conveying 528 | the work, and under which the third party grants, to any of the 529 | parties who would receive the covered work from you, a discriminatory 530 | patent license (a) in connection with copies of the covered work 531 | conveyed by you (or copies made from those copies), or (b) primarily 532 | for and in connection with specific products or compilations that 533 | contain the covered work, unless you entered into that arrangement, 534 | or that patent license was granted, prior to 28 March 2007. 535 | 536 | Nothing in this License shall be construed as excluding or limiting 537 | any implied license or other defenses to infringement that may 538 | otherwise be available to you under applicable patent law. 539 | 540 | 12. No Surrender of Others' Freedom. 541 | 542 | If conditions are imposed on you (whether by court order, agreement or 543 | otherwise) that contradict the conditions of this License, they do not 544 | excuse you from the conditions of this License. If you cannot convey a 545 | covered work so as to satisfy simultaneously your obligations under this 546 | License and any other pertinent obligations, then as a consequence you may 547 | not convey it at all. For example, if you agree to terms that obligate you 548 | to collect a royalty for further conveying from those to whom you convey 549 | the Program, the only way you could satisfy both those terms and this 550 | License would be to refrain entirely from conveying the Program. 551 | 552 | 13. Use with the GNU Affero General Public License. 553 | 554 | Notwithstanding any other provision of this License, you have 555 | permission to link or combine any covered work with a work licensed 556 | under version 3 of the GNU Affero General Public License into a single 557 | combined work, and to convey the resulting work. The terms of this 558 | License will continue to apply to the part which is the covered work, 559 | but the special requirements of the GNU Affero General Public License, 560 | section 13, concerning interaction through a network will apply to the 561 | combination as such. 562 | 563 | 14. Revised Versions of this License. 564 | 565 | The Free Software Foundation may publish revised and/or new versions of 566 | the GNU General Public License from time to time. Such new versions will 567 | be similar in spirit to the present version, but may differ in detail to 568 | address new problems or concerns. 569 | 570 | Each version is given a distinguishing version number. If the 571 | Program specifies that a certain numbered version of the GNU General 572 | Public License "or any later version" applies to it, you have the 573 | option of following the terms and conditions either of that numbered 574 | version or of any later version published by the Free Software 575 | Foundation. If the Program does not specify a version number of the 576 | GNU General Public License, you may choose any version ever published 577 | by the Free Software Foundation. 578 | 579 | If the Program specifies that a proxy can decide which future 580 | versions of the GNU General Public License can be used, that proxy's 581 | public statement of acceptance of a version permanently authorizes you 582 | to choose that version for the Program. 583 | 584 | Later license versions may give you additional or different 585 | permissions. However, no additional obligations are imposed on any 586 | author or copyright holder as a result of your choosing to follow a 587 | later version. 588 | 589 | 15. Disclaimer of Warranty. 590 | 591 | THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY 592 | APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT 593 | HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY 594 | OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, 595 | THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 596 | PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM 597 | IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF 598 | ALL NECESSARY SERVICING, REPAIR OR CORRECTION. 599 | 600 | 16. Limitation of Liability. 601 | 602 | IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 603 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS 604 | THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY 605 | GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE 606 | USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF 607 | DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD 608 | PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), 609 | EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF 610 | SUCH DAMAGES. 611 | 612 | 17. Interpretation of Sections 15 and 16. 613 | 614 | If the disclaimer of warranty and limitation of liability provided 615 | above cannot be given local legal effect according to their terms, 616 | reviewing courts shall apply local law that most closely approximates 617 | an absolute waiver of all civil liability in connection with the 618 | Program, unless a warranty or assumption of liability accompanies a 619 | copy of the Program in return for a fee. 620 | -------------------------------------------------------------------------------- /README.org: -------------------------------------------------------------------------------- 1 | * Restart Emacs 2 | 3 | [[http://melpa.org/#/restart-emacs][file:http://melpa.org/packages/restart-emacs-badge.svg]] [[http://stable.melpa.org/#/restart-emacs][file:http://stable.melpa.org/packages/restart-emacs-badge.svg]] [[https://travis-ci.org/iqbalansari/restart-emacs][https://travis-ci.org/iqbalansari/restart-emacs.svg?branch=master]] [[http://www.gnu.org/licenses/gpl-3.0.html][http://img.shields.io/:license-gpl3-blue.svg]] [[http://makeapullrequest.com][file:https://img.shields.io/badge/PRs-welcome-brightgreen.svg]] 4 | 5 | 6 | ** Table of contents :TOC_3_gh: 7 | - [[#restart-emacs][Restart Emacs]] 8 | - [[#what-is-this][What is this?]] 9 | - [[#installation][Installation]] 10 | - [[#elpa][ELPA]] 11 | - [[#el-get][El-get]] 12 | - [[#usage][Usage]] 13 | - [[#compatibility][Compatibility]] 14 | - [[#restarting-gui-emacs][Restarting GUI Emacs]] 15 | - [[#restarting-emacs-running-in-a-terminal][Restarting Emacs running in a terminal]] 16 | - [[#restarting-emacs-daemons][Restarting Emacs daemons]] 17 | - [[#contributing][Contributing]] 18 | - [[#known-issues][Known Issues]] 19 | - [[#command-line-arguments-are-not-preserved][Command line arguments are not preserved]] 20 | - [[#the-restarted-daemon-quits-as-soon-as-the-all-the-visible-frames-are-killed][The restarted daemon quits as soon as the all the visible frames are killed]] 21 | 22 | ** What is this? 23 | This is a simple package to restart Emacs for within Emacs. Inspired by [[http://emacs.stackexchange.com/questions/5428/restart-emacs-from-within-emacs][this]] 24 | stackoverflow question. 25 | 26 | ** Installation 27 | *** ELPA 28 | ~restart-emacs~ is available on [[http://melpa.org/#/restart-emacs][MELPA]] and [[http://stable.melpa.org/#/restart-emacs][MELPA Stable]]. Please follow the instructions on 29 | MELPA [[http://melpa.org/#/getting-started][website]] to enable it, if you haven't already. 30 | 31 | You can then install ~restart-emacs~ from the [[https://www.gnu.org/software/emacs/manual/html_node/emacs/Package-Menu.html][package menu]]. Alternatively install it by doing the following 32 | 33 | Refresh the package index 34 | #+BEGIN_QUOTE 35 | M-x package-refresh-contents RET 36 | #+END_QUOTE 37 | 38 | And then install it by doing 39 | #+BEGIN_QUOTE 40 | M-x package-install RET restart-emacs 41 | #+END_QUOTE 42 | 43 | *** El-get 44 | ~restart-emacs~ can also be installed using ~el-get~. Assuming you have latest version of el-get installing it by doing something similar to 45 | #+BEGIN_QUOTE 46 | M-x el-get-install RET restart-emacs 47 | #+END_QUOTE 48 | 49 | ** Usage 50 | It offers a command ~restart-emacs~ which kills current Emacs session 51 | and starts a new session. 52 | 53 | Additional arguments to be passed to the new instance can be specified using 54 | prefix arguments 55 | 56 | - with a single ~universal-argument~ (=C-u=) Emacs is restarted with ~--debug-init~ flag 57 | - with two ~universal-argument~ (=C-u= =C-u=) Emacs is restarted with ~-Q~ flag 58 | - with three ~universal-argument~ (=C-u= =C-u= =C-u=) the user is prompted for the arguments 59 | 60 | ~restart-emacs~ can restore frames on restart, right this is experimental and 61 | disabled by default to enable it set ~restart-emacs-restore-frames~ to ~t~. 62 | 63 | There is also a second command ~restart-emacs-start-new-emacs~ which starts a 64 | new session of Emacs without killing the current one. It takes the same arguments 65 | as ~restart-emacs~. 66 | 67 | ** Compatibility 68 | *** Restarting GUI Emacs 69 | Restarting graphical Emacs should work on any UNIXy system with ~sh~ and on 70 | Windows. 71 | 72 | *** Restarting Emacs running in a terminal 73 | This requires that the shell from which Emacs was launched supports job 74 | control. This has been tested to work on ~sh~, ~bash~, ~zsh~, ~fish~, ~csh~ 75 | and ~tcsh~, however this does not work on Windows. 76 | 77 | *** Restarting Emacs daemons 78 | The latest version of ~restart-emacs~ can now restart Emacs daemons. The the 79 | frames are restored once the daemon restarts using ~desktop-mode~. However 80 | since ~desktop-mode~ learned to restore frames only Emacs version 24.4 81 | onwards the daemons can be restarted only on Emacs versions 24.4 and later. 82 | 83 | Another issue with restarting Emacs daemons is that the frames open in a 84 | terminal cannot be recreated on restart, instead the ~restart-emacs~ would 85 | write a notification on the terminal with the instructions to reconnect, any 86 | suggestions to improve this are welcome. 87 | 88 | ** Contributing 89 | Code as well as documentation contributions are welcome. 90 | 91 | [[https://github.com/cask/cask][Cask]] is used to manage project dependencies so make sure you have it 92 | installed. To run the tests you need to install the dependencies by running 93 | the following 94 | 95 | #+BEGIN_SRC sh 96 | cask install 97 | #+END_SRC 98 | 99 | After the installation completes you can run the tests by running the 100 | following command 101 | 102 | #+BEGIN_SRC sh 103 | cask exec ert-runner 104 | #+END_SRC 105 | 106 | ** Known Issues 107 | *** Command line arguments are not preserved 108 | The new Emacs instance does not use the same command line arguments as the 109 | running instance. See [[https://github.com/iqbalansari/restart-emacs/issues/11][#11]] for more details 110 | *** The restarted daemon quits as soon as the all the visible frames are killed 111 | See https://github.com/iqbalansari/restart-emacs/issues/10#issuecomment-307565719 112 | -------------------------------------------------------------------------------- /linux-gui-restart-test.sh: -------------------------------------------------------------------------------- 1 | #!/bin/sh 2 | 3 | # This scripts tests that Emacs restarts successfully under X 4 | # It requires the following utilities installed 5 | # xprop - Available in x11-utils package on Ubuntu 6 | # xwininfo - Available in x11-utils package on Ubuntu 7 | # xdotool - Available in xdotool package on Ubuntu 8 | 9 | if [ -z "$DISPLAY" ] ; then 10 | echo "This script works only under X!" 11 | echo "Exiting ..." 12 | exit 2 13 | fi 14 | 15 | if [ -z $(which xprop 2> /dev/null) ] || [ -z $(which xwininfo 2> /dev/null) ] || [ -z $(which xdotool 2> /dev/null) ] ; then 16 | echo "This script requires xprop, xwininfo and xdotool to work." 17 | echo "If you are on Ubuntu, please install x11-utils and xdotools packages to get these tools." 18 | echo "Exiting ..." 19 | exit 2 20 | fi 21 | 22 | 23 | poll_emacs_started () { 24 | for i in $(seq 1 10) ; do 25 | echo "Checking if Emacs started ... " 26 | 27 | if xwininfo -name $EMACS_WIN_NAME > /dev/null 2>&1 ; then 28 | echo "Emacs has started ... " 29 | return 0 30 | 31 | elif [ $i = 10 ] ; then 32 | echo "Giving up after 10 tries ... " 33 | return 1 34 | 35 | fi 36 | 37 | echo "Emacs hasn't started yet! Will try again in 5 seconds ... " 38 | sleep 5 39 | done 40 | 41 | } 42 | 43 | # So that user config does not interfere with functioning of test Emacs 44 | HOME=/tmp 45 | 46 | SUCCESS=1 47 | 48 | # Name that should be given Emacs window, makes easier to search for window 49 | EMACS_WIN_NAME=restart-emacs-test 50 | 51 | # Setup things so that Emacs window is renamed appropriately after starting 52 | mkdir -p /tmp/.emacs.d/ 53 | printf "(modify-frame-parameters nil (list (cons 'name \"$EMACS_WIN_NAME\")))" > /tmp/.emacs.d/init.el 54 | 55 | # Launch Emacs 56 | cask exec emacs -l restart-emacs.el > /dev/null 2>&1 & 57 | 58 | if poll_emacs_started ; then 59 | EMACS_WINDOW_ID=$(xwininfo -name $EMACS_WIN_NAME | grep 'Window id:' | awk -F' ' '{print $4}') 60 | ORIG_EMACS_PID=$(xprop -name $EMACS_WIN_NAME | grep PID | awk -F' = ' '{print $2}') 61 | 62 | echo "Found Emacs running with window id $EMACS_WINDOW_ID and pid $ORIG_EMACS_PID .. " 63 | 64 | sleep 1 65 | 66 | echo "Asking Emacs to restart .. " 67 | xdotool search --name $EMACS_WIN_NAME key alt+x 68 | sleep 1 69 | xdotool search --name $EMACS_WIN_NAME type 'restart-emacs' 70 | sleep 1 71 | xdotool search --name $EMACS_WIN_NAME key Return 72 | 73 | 74 | sleep 5 75 | 76 | if poll_emacs_started ; then 77 | RESTARTED_EMACS_PID=$(xprop -name $EMACS_WIN_NAME | grep PID | awk -F' = ' '{print $2}') 78 | 79 | if [ $ORIG_EMACS_PID != $RESTARTED_EMACS_PID ] ; then 80 | echo "Successfully restarted Emacs!" 81 | echo "Test PASSED" 82 | SUCCESS=0 83 | else 84 | echo "The original Emacs was not killed properly!" 85 | echo "Test FAILED" 86 | fi 87 | 88 | else 89 | echo "Could not restart Emacs, after killing original one!" 90 | echo "Test FAILED" 91 | fi 92 | 93 | else 94 | echo "Could start Emacs, please check for errros and try again!" 95 | SUCCESS=2 96 | fi 97 | 98 | # Cleanup 99 | xdotool search --name $EMACS_WIN_NAME key ctrl+x 100 | xdotool search --name $EMACS_WIN_NAME key ctrl+c 101 | exit $SUCCESS 102 | -------------------------------------------------------------------------------- /restart-emacs.el: -------------------------------------------------------------------------------- 1 | ;;; restart-emacs.el --- Restart emacs from within emacs -*- lexical-binding: t; -*- 2 | 3 | ;; Copyright (C) 2015-2017 Iqbal Ansari 4 | 5 | ;; Author: Iqbal Ansari 6 | ;; Keywords: convenience 7 | ;; URL: https://github.com/iqbalansari/restart-emacs 8 | ;; Version: 0.1.1 9 | 10 | ;; This program is free software; you can redistribute it and/or modify 11 | ;; it under the terms of the GNU General Public License as published by 12 | ;; the Free Software Foundation, either version 3 of the License, or 13 | ;; (at your option) any later version. 14 | 15 | ;; This program is distributed in the hope that it will be useful, 16 | ;; but WITHOUT ANY WARRANTY; without even the implied warranty of 17 | ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 18 | ;; GNU General Public License for more details. 19 | 20 | ;; You should have received a copy of the GNU General Public License 21 | ;; along with this program. If not, see . 22 | 23 | ;;; Commentary: 24 | 25 | ;; This package provides a simple command to restart Emacs from within Emacs 26 | 27 | 28 | 29 | ;;; Code: 30 | 31 | (require 'server) 32 | (require 'desktop) 33 | 34 | ;; Making the byte compiler happy 35 | (declare-function w32-shell-execute "w32fns.c") 36 | 37 | 38 | 39 | ;; Customizations 40 | 41 | (defgroup restart-emacs nil 42 | "Customization options for restart-emacs" 43 | :group 'tools 44 | :prefix "restart-emacs-") 45 | 46 | (defcustom restart-emacs-daemon-with-tty-frames-p nil 47 | "Restart Emacs daemon even if it has tty frames. 48 | 49 | Currently `restart-emacs' cannot restore such frames, it just 50 | notifies the user once the daemon has restarted" 51 | :type 'boolean 52 | :group 'restart-emacs) 53 | 54 | (defcustom restart-emacs-restore-frames nil 55 | "Attempt to restore frames on Emacs restart. 56 | 57 | Please note this functionality works only on Emacs 24.4 and later, since the 58 | earlier versions did not ship with the frameset library which is used to restore 59 | the frames. This variable is ignored while restarting daemon since frames are 60 | restored unconditionally while restarting daemon mode." 61 | :type 'boolean 62 | :group 'restart-emacs) 63 | 64 | 65 | 66 | ;; Compatibility functions 67 | 68 | (defun restart-emacs--string-join (strings &optional separator) 69 | "Join all STRINGS using SEPARATOR. 70 | 71 | This function is available on Emacs v24.4 and higher, it has been 72 | backported here for compatibility with older Emacsen." 73 | (if (fboundp 'string-join) 74 | (apply #'string-join (list strings separator)) 75 | (mapconcat 'identity strings separator))) 76 | 77 | (defun restart-emacs--user-error (format &rest args) 78 | "Signal a `user-error' if available otherwise signal a generic `error'. 79 | 80 | FORMAT and ARGS correspond to STRING and OBJECTS arguments to `format'." 81 | (if (fboundp 'user-error) 82 | (apply #'user-error format args) 83 | (apply #'error format args))) 84 | 85 | 86 | 87 | ;; Core functions 88 | 89 | (defvar restart-emacs--args nil 90 | "The arguments with which to restart Emacs is bound dynamically.") 91 | 92 | (defun restart-emacs--get-emacs-binary () 93 | "Get absolute path to binary of currently running Emacs. 94 | 95 | On Windows get path to runemacs.exe if possible." 96 | (let ((emacs-binary-path (expand-file-name invocation-name invocation-directory)) 97 | (runemacs-binary-path (when (memq system-type '(windows-nt ms-dos)) 98 | (expand-file-name "runemacs.exe" invocation-directory)))) 99 | (if (and runemacs-binary-path (file-exists-p runemacs-binary-path)) 100 | runemacs-binary-path 101 | emacs-binary-path))) 102 | 103 | (defun restart-emacs--record-tty-file (current &rest ignored) 104 | "Save the buffer which is being currently selected in the frame. 105 | 106 | This function is used as a filter for tty frames in `frameset-filter-alist'. 107 | See `frameset-filter-alist' for explanation of CURRENT and rest of the 108 | parameters. IGNORED are ignored." 109 | (when (processp (cdr current)) 110 | (let ((window (frame-selected-window (process-get (cdr current) 'frame)))) 111 | (cons 'restart-emacs-file (buffer-file-name (window-buffer window)))))) 112 | 113 | (defun restart-emacs--notify-connection-instructions (tty filename) 114 | "Print instructions on the given TTY about connecting to the daemon. 115 | 116 | It prints the complete command line invocation that can be used connect to the 117 | newly restarted daemon, FILENAME is the path to the the file that was selected 118 | in the frame that was open on this tty before the daemon restarted." 119 | (with-temp-file tty 120 | (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir)) 121 | (server-file (expand-file-name server-name server-dir)) 122 | (emacsclient-path (expand-file-name "emacsclient" invocation-directory)) 123 | (quoted-server-file (shell-quote-argument server-file)) 124 | (quoted-emacsclient-path (shell-quote-argument emacsclient-path)) 125 | (message (if filename 126 | (format "Emacs daemon restarted! Use '%s -nw -s %s %s' to reconnect to it" 127 | quoted-emacsclient-path 128 | quoted-server-file 129 | (shell-quote-argument filename)) 130 | (format "Emacs daemon restarted! Use '%s -nw -s %s' to reconnect to it" 131 | quoted-emacsclient-path 132 | quoted-server-file)))) 133 | (insert message)))) 134 | 135 | (defun restart-emacs--frameset-tty-filter (tty filtered parameters saving) 136 | "Restore the TTY from saved frameset. 137 | 138 | This does not actually restore anything rather it simply notifies the user on 139 | tty the instructions to reconnect to the daemon and then invokes the default 140 | filter for ttys (`frameset-filter-tty-to-GUI') 141 | 142 | See the documentation for `frameset-filter-alist' to understand FILTERED, 143 | PARAMETERS and SAVING." 144 | (when (cdr tty) 145 | (run-at-time 0.5 146 | nil 147 | (apply-partially 'restart-emacs--notify-connection-instructions 148 | (cdr tty) 149 | (cdr (assoc 'restart-emacs-file filtered))))) 150 | (frameset-filter-tty-to-GUI tty filtered parameters saving)) 151 | 152 | (defun restart-emacs--restore-frames-using-desktop (file) 153 | "Restore the frames using the desktop FILE." 154 | ;; We let-bind a bunch of variables from desktop mode to make sure 155 | ;; the changes done while restoring from the desktop file are not 156 | ;; leaked into normal functioning of the desktop-mode 157 | (let* (desktop-file-modtime 158 | (desktop-dirname (file-name-directory file)) 159 | (desktop-base-file-name (file-name-base file)) 160 | (desktop-base-lock-name (concat desktop-base-file-name ".lock")) 161 | (desktop-restore-reuses-frames nil) 162 | ;; Add filter for tty frames, the filter simply logs a message on 163 | ;; the parent ttys of the frame 164 | (frameset-filter-alist (append '((tty . restart-emacs--frameset-tty-filter)) 165 | frameset-filter-alist)) 166 | ;; Disable prompts for safe variables during restoration 167 | (enable-local-variables :safe) 168 | ;; We mock these two functions while restoring frames 169 | ;; Calls to `display-color-p' blocks Emacs in daemon mode (possibly) 170 | ;; because the call fails 171 | (display-color-p (symbol-function 'display-color-p)) 172 | ;; We mock `display-graphic-p' since desktop mode has changed to 173 | ;; not restore frames when we are not on graphic display 174 | ;; TODO: Report Emacs bug 175 | (display-graphic-p (symbol-function 'display-graphic-p))) 176 | (unwind-protect 177 | (progn 178 | ;; TODO: The following might break things 179 | (when (daemonp) 180 | (fset 'display-color-p (lambda (&rest ignored) t)) 181 | (fset 'display-graphic-p (lambda (&rest ignored) t))) 182 | (desktop-read desktop-dirname) 183 | (desktop-release-lock desktop-dirname)) 184 | ;; Restore display-color-p's definition 185 | (fset 'display-color-p display-color-p) 186 | ;; Restore display-graphic-p's definition 187 | (fset 'display-graphic-p display-graphic-p) 188 | ;; Cleanup the files 189 | (ignore-errors (delete-file (desktop-full-file-name))) 190 | (ignore-errors (delete-file (desktop-full-lock-name)))))) 191 | 192 | (defun restart-emacs--save-frames-using-desktop () 193 | "Save current frames to a file and return the full path to the file." 194 | (let* (desktop-file-modtime 195 | (desktop-base-file-name (make-temp-name "restart-emacs-desktop")) 196 | (desktop-dirname temporary-file-directory) 197 | (desktop-restore-eager t) 198 | ;; For tty frames record the currently selected file 199 | (frameset-filter-alist (append '((client . restart-emacs--record-tty-file)) 200 | frameset-filter-alist))) 201 | (desktop-save temporary-file-directory t t) 202 | (expand-file-name desktop-base-file-name desktop-dirname))) 203 | 204 | (defun restart-emacs--frame-restore-args () 205 | "Get the arguments for restoring frames." 206 | ;; frameset was not available on old versions 207 | (when (and (locate-library "frameset") 208 | ;; If user has enabled desktop-save-mode leave him alone unless she 209 | ;; is restarting the daemon since right now Emacs does not restore 210 | ;; the frames in daemon mode. Also ignore the `restart-emacs-restore-frames' 211 | ;; configuration since restarting the daemon without restoring frames 212 | ;; doesn't really help 213 | (or (daemonp) 214 | (and restart-emacs-restore-frames 215 | (not (bound-and-true-p desktop-save-mode))))) 216 | (list "--restart-emacs-desktop" 217 | (restart-emacs--save-frames-using-desktop)))) 218 | 219 | (defun restart-emacs--start-gui-using-sh (&optional args) 220 | "Start GUI version of Emacs using sh. 221 | 222 | ARGS is the list arguments with which Emacs should be started" 223 | (call-process "sh" nil 224 | 0 nil 225 | "-c" (format "%s %s &" 226 | (shell-quote-argument (restart-emacs--get-emacs-binary)) 227 | (restart-emacs--string-join (mapcar #'shell-quote-argument 228 | args) 229 | " ")))) 230 | 231 | (defun restart-emacs--start-gui-on-windows (&optional args) 232 | "Start GUI version of Emacs on windows. 233 | 234 | ARGS is the list arguments with which Emacs should be started" 235 | (w32-shell-execute "open" 236 | (restart-emacs--get-emacs-binary) 237 | (restart-emacs--string-join args " "))) 238 | 239 | (defun restart-emacs--start-emacs-in-terminal (&optional args) 240 | "Start Emacs in current terminal. 241 | 242 | ARGS is the list arguments with which Emacs should be started. This requires a 243 | shell with `fg' command and `;' construct. This has been tested to work with 244 | sh, bash, zsh, fish, csh and tcsh shells" 245 | (suspend-emacs (format "fg ; %s %s -nw" 246 | (shell-quote-argument (restart-emacs--get-emacs-binary)) 247 | (restart-emacs--string-join (mapcar #'shell-quote-argument 248 | args) 249 | " ")))) 250 | 251 | (defun restart-emacs--daemon-using-sh (&optional args) 252 | "Restart Emacs daemon with the provided ARGS. 253 | 254 | This function makes sure the new Emacs instance uses the same server-name as the 255 | current instance" 256 | (call-process "sh" nil 257 | 0 nil 258 | "-c" (format "%s --daemon=%s %s &" 259 | (shell-quote-argument (restart-emacs--get-emacs-binary)) 260 | server-name 261 | (restart-emacs--string-join (mapcar #'shell-quote-argument args) 262 | " ")))) 263 | 264 | (defun restart-emacs--daemon-on-windows (&optional args) 265 | "Restart Emacs daemon with the provided ARGS. 266 | 267 | This function makes sure the new Emacs instance uses the same server-name as the 268 | current instance 269 | 270 | TODO: Not tested yet" 271 | (w32-shell-execute "open" 272 | (restart-emacs--get-emacs-binary) 273 | (restart-emacs--string-join (cons (concat "--daemon=" server-name) 274 | args) 275 | " "))) 276 | 277 | (defun restart-emacs--ensure-can-restart () 278 | "Ensure we can restart Emacs on current platform." 279 | (when (and (not (display-graphic-p)) 280 | (memq system-type '(windows-nt ms-dos))) 281 | (restart-emacs--user-error (format "Cannot restart Emacs running in terminal on system of type `%s'" system-type))) 282 | 283 | (when (and (daemonp) 284 | (not (locate-library "frameset"))) 285 | (restart-emacs--user-error "Cannot restart Emacs daemon on versions before 24.4")) 286 | 287 | (when (and (daemonp) 288 | (delq nil (mapcar (lambda (frame) 289 | (frame-parameter frame 'tty)) 290 | (frame-list))) 291 | (not restart-emacs-daemon-with-tty-frames-p) 292 | (not (yes-or-no-p "Current Emacs daemon has tty frames, `restart-emacs' cannot restore them, continue anyway? "))) 293 | (restart-emacs--user-error "Current Emacs daemon has tty frames, aborting `restart-emacs'. 294 | Set `restart-emacs-with-tty-frames-p' to non-nil to restart Emacs irrespective of tty frames"))) 295 | 296 | (defun restart-emacs--launch-other-emacs (arguments) 297 | "Launch another Emacs session with ARGUMENTS according to current platform." 298 | (apply (cond ((daemonp) (if (memq system-type '(windows-nt ms-dos)) 299 | #'restart-emacs--daemon-on-windows 300 | #'restart-emacs--daemon-using-sh)) 301 | 302 | ((display-graphic-p) (if (memq system-type '(windows-nt ms-dos)) 303 | #'restart-emacs--start-gui-on-windows 304 | #'restart-emacs--start-gui-using-sh)) 305 | 306 | (t (if (memq system-type '(windows-nt ms-dos)) 307 | ;; This should not happen since we check this before triggering a restart 308 | (restart-emacs--user-error "Cannot restart Emacs running in a windows terminal") 309 | #'restart-emacs--start-emacs-in-terminal))) 310 | ;; Since this function is called in `kill-emacs-hook' it cannot accept 311 | ;; direct arguments the arguments are let-bound instead 312 | (list arguments))) 313 | 314 | (defun restart-emacs--translate-prefix-to-args (prefix) 315 | "Translate the given PREFIX to arguments to be passed to Emacs. 316 | 317 | It does the following translation 318 | `C-u' => --debug-init 319 | `C-u' `C-u' => -Q 320 | `C-u' `C-u' `C-u' => Reads the argument from the user in raw form" 321 | (cond ((equal prefix '(4)) '("--debug-init")) 322 | ((equal prefix '(16)) '("-Q")) 323 | ((equal prefix '(64)) (split-string (read-string "Arguments to start Emacs with (separated by space): ") 324 | " ")))) 325 | 326 | (defun restart-emacs--guess-startup-directory-using-proc () 327 | "Get the startup directory of current Emacs session from /proc." 328 | (when (file-exists-p (format "/proc/%d/cwd" (emacs-pid))) 329 | (file-chase-links (format "/proc/%d/cwd" (emacs-pid))))) 330 | 331 | (defun restart-emacs--guess-startup-directory-using-lsof () 332 | "Get the startup directory of the current Emacs session using the `lsof' program." 333 | (when (executable-find "lsof") 334 | (let* ((default-directory "/") 335 | (lsof-op (shell-command-to-string (format "lsof -d cwd -a -Fn -p %d" 336 | (emacs-pid)))) 337 | (raw-cwd (car (last (split-string lsof-op "\n" t)))) 338 | (cwd (substring raw-cwd 1))) 339 | (when (< 0 (length cwd)) 340 | cwd)))) 341 | 342 | (defun restart-emacs--guess-startup-directory-using-buffers () 343 | "Guess the startup directory for current Emacs session from some buffer. 344 | 345 | This tries to get Emacs startup directory from the *Messages* or *scratch* 346 | buffer, needless to say this would be wrong if the user has killed and recreated 347 | these buffers." 348 | (or (and (get-buffer "*Messages*") 349 | (with-current-buffer "*Messages*" default-directory)) 350 | (and (get-buffer "*scratch*") 351 | (with-current-buffer "*scratch*" default-directory)))) 352 | 353 | (defun restart-emacs--guess-startup-directory-from-env () 354 | "Guess the startup directory for current Emacs session from USERPROFILE or HOME." 355 | (or (getenv "HOME") 356 | (getenv "USERPROFILE"))) 357 | 358 | (defun restart-emacs--guess-startup-directory () 359 | "Guess the directory the new Emacs instance should start from. 360 | 361 | On Linux it figures out the startup directory by reading /proc entry for current 362 | Emacs instance. Otherwise it falls back to guessing the startup directory by 363 | reading `default-directory' of *Messages* or *scratch* buffers falling back to 364 | the HOME or USERPROFILE (only applicable on Window) environment variable and 365 | finally just using whatever is the current `default-directory'." 366 | (or (restart-emacs--guess-startup-directory-using-proc) 367 | (restart-emacs--guess-startup-directory-using-lsof) 368 | (restart-emacs--guess-startup-directory-using-buffers) 369 | (restart-emacs--guess-startup-directory-from-env) 370 | default-directory)) 371 | 372 | 373 | 374 | ;; User interface 375 | 376 | ;;;###autoload 377 | (defun restart-emacs-handle-command-line-args (&rest ignored) 378 | "Handle the --restart-emacs-desktop command line argument. 379 | 380 | The value of the argument is the desktop file from which the frames should be 381 | restored. IGNORED are ignored." 382 | (restart-emacs--restore-frames-using-desktop (pop command-line-args-left))) 383 | 384 | ;;;###autoload 385 | (add-to-list 'command-switch-alist '("--restart-emacs-desktop" . restart-emacs-handle-command-line-args)) 386 | 387 | (defvar restart-emacs--inhibit-kill-p nil 388 | "Non-nil means inhibit killing the current session when restarting. 389 | This means that `restart-emacs' will spawn a new instance of 390 | Emacs without killing the current one. 391 | 392 | This is used internally to implement the command 393 | `restart-emacs-start-new-emacs'.") 394 | 395 | ;;;###autoload 396 | (defun restart-emacs (&optional args) 397 | "Restart Emacs. 398 | 399 | When called interactively ARGS is interpreted as follows 400 | 401 | - with a single `universal-argument' (`C-u') Emacs is restarted 402 | with `--debug-init' flag 403 | - with two `universal-argument' (`C-u') Emacs is restarted with 404 | `-Q' flag 405 | - with three `universal-argument' (`C-u') the user prompted for 406 | the arguments 407 | 408 | When called non-interactively ARGS should be a list of arguments 409 | with which Emacs should be restarted." 410 | (interactive "P") 411 | ;; Do not trigger a restart unless we are sure, we can restart emacs 412 | (restart-emacs--ensure-can-restart) 413 | ;; We need the new emacs to be spawned after all kill-emacs-hooks 414 | ;; have been processed and there is nothing interesting left 415 | (let* ((default-directory (restart-emacs--guess-startup-directory)) 416 | (translated-args (if (called-interactively-p 'any) 417 | (restart-emacs--translate-prefix-to-args args) 418 | args)) 419 | (restart-args (append translated-args 420 | ;; When Emacs is started with a -Q 421 | ;; restart-emacs's autoloads would not be present 422 | ;; causing the the --restart-emacs-desktop 423 | ;; argument to be unhandled 424 | (unless (member "-Q" translated-args) 425 | (restart-emacs--frame-restore-args)))) 426 | (kill-emacs-hook (append kill-emacs-hook 427 | (unless restart-emacs--inhibit-kill-p 428 | (list (apply-partially #'restart-emacs--launch-other-emacs 429 | restart-args)))))) 430 | (if restart-emacs--inhibit-kill-p 431 | (restart-emacs--launch-other-emacs restart-args) 432 | (save-buffers-kill-emacs)))) 433 | 434 | ;;;###autoload 435 | (defun restart-emacs-start-new-emacs (&optional args) 436 | "Start a new instance of Emacs. 437 | 438 | When called interactively ARGS is interpreted as follows 439 | 440 | - with a single `universal-argument' (`C-u') the new Emacs is started 441 | with `--debug-init' flag 442 | - with two `universal-argument' (`C-u') the new Emacs is started with 443 | `-Q' flag 444 | - with three `universal-argument' (`C-u') the user prompted for 445 | the arguments 446 | 447 | When called non-interactively ARGS should be a list of arguments 448 | with which the new Emacs should be started." 449 | (interactive "P") 450 | (let ((restart-emacs--inhibit-kill-p t)) 451 | (restart-emacs args))) 452 | 453 | (provide 'restart-emacs) 454 | ;;; restart-emacs.el ends here 455 | -------------------------------------------------------------------------------- /test/restart-emacs-test.el: -------------------------------------------------------------------------------- 1 | ;;; restart-emacs-test.el --- Tests for restart-emacs -*- lexical-binding: t; -*- 2 | 3 | ;;; Commentary: 4 | ;;; Tests for restart-emacs, major use case is to run from the command-line 5 | ;;; using `cask exec ert-runner' but can be run interactively as well. Do 6 | ;;; M-x `eval-buffer' RET 7 | 8 | ;;; Code: 9 | 10 | ;; For interactive testing 11 | (unless noninteractive 12 | (load (expand-file-name "test-helper.el") t)) 13 | 14 | (require 'restart-emacs) 15 | 16 | (require 'ert) 17 | (require 'el-mock) 18 | ;; el-mock requires this 19 | (require 'cl) 20 | 21 | (require 'cl-lib) 22 | 23 | (ert-deftest restart-emacs-test-prefix-translation () 24 | (with-mock 25 | (stub read-string => "read string") 26 | (should (equal (restart-emacs--translate-prefix-to-args '(4)) '("--debug-init"))) 27 | (should (equal (restart-emacs--translate-prefix-to-args '(16)) '("-Q"))) 28 | (should (equal (restart-emacs--translate-prefix-to-args '(64)) '("read" "string"))))) 29 | 30 | (ert-deftest restart-emacs-test-restart-capability () 31 | (with-mock 32 | (stub display-graphic-p => nil) 33 | ;; `signal' tries to use this (and fails) if `system-type' is `windows-nt', 34 | ;; stub it out 35 | (stub w32-long-file-name => "/tmp") 36 | (let ((system-type 'windows-nt)) 37 | (should-error (restart-emacs--ensure-can-restart) :type (if (version<= "24.3" emacs-version) 38 | 'user-error 39 | 'error))) 40 | 41 | (let ((system-type 'ms-dos)) 42 | (should-error (restart-emacs--ensure-can-restart) :type (if (version<= "24.3" emacs-version) 43 | 'user-error 44 | 'error)))) 45 | 46 | (with-mock 47 | (stub display-graphic-p => t) 48 | (let ((system-type 'windows-nt)) 49 | (should-not (restart-emacs--ensure-can-restart))) 50 | 51 | (let ((system-type 'ms-dos)) 52 | (should-not (restart-emacs--ensure-can-restart))))) 53 | 54 | (ert-deftest restart-emacs-test-path-calculation () 55 | (let ((invocation-name "emacs") 56 | (invocation-directory "/tmp/test/")) 57 | (should (string= (restart-emacs--get-emacs-binary) "/tmp/test/emacs"))) 58 | 59 | ;; Use runemacs.exe on Windows see #2 on Github 60 | (with-mock 61 | (stub w32-long-file-name => "/tmp") 62 | (stub file-exists-p => t) 63 | (let ((invocation-name "emacs") 64 | (invocation-directory "/tmp/test/") 65 | (system-type 'windows-nt)) 66 | (should (string= (restart-emacs--get-emacs-binary) "/tmp/test/runemacs.exe"))))) 67 | 68 | (ert-deftest restart-emacs-test-gui-using-sh () 69 | (with-mock 70 | (stub restart-emacs--get-emacs-binary => "/tmp/bin/emacs") 71 | (mock (call-process "sh" nil 72 | 0 nil 73 | "-c" "/tmp/bin/emacs --debug-init &")) 74 | (restart-emacs--start-gui-using-sh '("--debug-init")))) 75 | 76 | (ert-deftest restart-emacs-test-gui-on-windows () 77 | (with-mock 78 | (stub restart-emacs--get-emacs-binary => "/tmp/bin/emacs") 79 | ;; w32-shell-execute expects arguments to be space separated string, see #5 on Github 80 | (mock (w32-shell-execute "open" "/tmp/bin/emacs" "--debug-init some-random-arg")) 81 | (restart-emacs--start-gui-on-windows '("--debug-init" "some-random-arg")))) 82 | 83 | (ert-deftest restart-emacs-test-start-emacs-in-terminal () 84 | (with-mock 85 | (stub restart-emacs--get-emacs-binary => "/tmp/bin/emacs") 86 | (mock (suspend-emacs "fg ; /tmp/bin/emacs --debug-init -nw")) 87 | (restart-emacs--start-emacs-in-terminal '("--debug-init")))) 88 | 89 | (ert-deftest restart-emacs-test-strategy () 90 | (with-mock 91 | (stub display-graphic-p => nil) 92 | ;; `signal' tries to use this (and fails) if `system-type' is `windows-nt', 93 | ;; stub it out 94 | (stub w32-long-file-name => "/tmp") 95 | (mock (restart-emacs--start-emacs-in-terminal nil) :times 5) 96 | (dolist (system '(gnu gnu/linux gnu/kfreebsd darwin cygwin)) 97 | (let ((system-type system)) 98 | (should-not (restart-emacs--launch-other-emacs nil)))) 99 | 100 | (dolist (system '(windows-nt ms-dos)) 101 | (let ((system-type system)) 102 | (should-error (restart-emacs--launch-other-emacs nil) :type (if (version<= "24.3" emacs-version) 103 | 'user-error 104 | 'error))))) 105 | 106 | (with-mock 107 | (stub display-graphic-p => t) 108 | (mock (restart-emacs--start-gui-using-sh nil) :times 5) 109 | (mock (restart-emacs--start-gui-on-windows nil) :times 2) 110 | (dolist (system '(gnu gnu/linux gnu/kfreebsd darwin cygwin)) 111 | (let ((system-type system)) 112 | (should-not (restart-emacs--launch-other-emacs nil)))) 113 | 114 | (dolist (system '(windows-nt ms-dos)) 115 | (let ((system-type system)) 116 | (should-not (restart-emacs--launch-other-emacs nil)))))) 117 | 118 | (ert-deftest restart-emacs-test-restart-setup () 119 | (cl-letf (((symbol-function 'save-buffers-kill-emacs) 120 | (lambda nil 121 | (should (equal (cl-position (apply-partially #'restart-emacs--launch-other-emacs 122 | (restart-emacs--frame-restore-args)) 123 | kill-emacs-hook 124 | :test #'equal) 125 | (1- (length kill-emacs-hook))))))) 126 | 127 | (restart-emacs) 128 | ;; Make sure that hook to restart emacs is removed after the function 129 | ;; restart-emacs exits 130 | (should-not (cl-find (apply-partially #'restart-emacs--launch-other-emacs 131 | (restart-emacs--frame-restore-args)) 132 | kill-emacs-hook 133 | :test #'equal)))) 134 | 135 | (unless noninteractive 136 | (ert "^restart-emacs-")) 137 | 138 | (provide 'restart-emacs-test) 139 | ;;; restart-emacs-test.el ends here 140 | -------------------------------------------------------------------------------- /test/test-helper.el: -------------------------------------------------------------------------------- 1 | ;;; test-helper.el --- Tests for restart-emacs -*- lexical-binding: t; -*- 2 | 3 | ;;; Commentary: 4 | ;;; Helpers to write tests for restart-emacs 5 | 6 | ;;; Code: 7 | 8 | ;; Setup load-path, some of this is redundant when tests are run from the 9 | ;; command line 10 | (let ((project-dir (locate-dominating-file (or (buffer-file-name) load-file-name) 11 | ".cask"))) 12 | (if (not project-dir) 13 | (user-error "Could not locate project root") 14 | (let ((default-directory (expand-file-name (format ".cask/%d.%d" 15 | emacs-major-version 16 | emacs-minor-version) 17 | project-dir))) 18 | (normal-top-level-add-subdirs-to-load-path)) 19 | 20 | (add-to-list 'load-path project-dir))) 21 | 22 | ;;; test-helper.el ends here 23 | --------------------------------------------------------------------------------